From 12332348b0f51adff1967e1bc9ea17c0887802a3 Mon Sep 17 00:00:00 2001 From: lyc Date: Tue, 30 Jul 2024 17:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=AF=BE=E6=A8=A1=E5=9D=97---?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/api/subject/index.js | 2 +- src/renderer/src/api/teaching/classwork.js | 19 +++ src/renderer/src/assets/iconfont/iconfont.css | 12 +- src/renderer/src/assets/iconfont/iconfont.js | 2 +- .../src/assets/iconfont/iconfont.json | 7 + src/renderer/src/assets/iconfont/iconfont.svg | 2 + src/renderer/src/assets/iconfont/iconfont.ttf | Bin 17172 -> 17532 bytes .../src/assets/iconfont/iconfont.woff | Bin 8400 -> 8624 bytes .../src/assets/iconfont/iconfont.woff2 | Bin 7052 -> 7264 bytes .../src/components/file-image/index.vue | 13 +- .../prepare/container/file-list-item.vue | 88 ++++++++---- src/renderer/src/views/prepare/index.vue | 134 ++++++++++++++++-- 12 files changed, 226 insertions(+), 53 deletions(-) create mode 100644 src/renderer/src/api/teaching/classwork.js diff --git a/src/renderer/src/api/subject/index.js b/src/renderer/src/api/subject/index.js index 127416a..3e7c614 100644 --- a/src/renderer/src/api/subject/index.js +++ b/src/renderer/src/api/subject/index.js @@ -9,7 +9,6 @@ export const listEvaluation = (params)=> { }) } - export const addFileToPrepare = (params) => { return request({ url: '/smarttalk/file/addFileToPrepare', @@ -17,3 +16,4 @@ export const addFileToPrepare = (params) => { params }) } + diff --git a/src/renderer/src/api/teaching/classwork.js b/src/renderer/src/api/teaching/classwork.js new file mode 100644 index 0000000..caeea2d --- /dev/null +++ b/src/renderer/src/api/teaching/classwork.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询classwork列表 +export function homeworklist(params) { + return request({ + url: '/education/classwork/list', + method: 'get', + params + }) +} + +// 查询entpcourse列表 +export function listEntpcourse(query) { + return request({ + url: '/education/entpcourse/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index d4e9d4e..0b91d55 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 2794390 */ - src: url('iconfont.woff2?t=1721815727687') format('woff2'), - url('iconfont.woff?t=1721815727687') format('woff'), - url('iconfont.ttf?t=1721815727687') format('truetype'), - url('iconfont.svg?t=1721815727687#iconfont') format('svg'); + src: url('iconfont.woff2?t=1722323882803') format('woff2'), + url('iconfont.woff?t=1722323882803') format('woff'), + url('iconfont.ttf?t=1722323882803') format('truetype'), + url('iconfont.svg?t=1722323882803#iconfont') format('svg'); } .iconfont { @@ -14,6 +14,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zuoye1:before { + content: "\e610"; +} + .icon-xiazai9:before { content: "\e60b"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.js b/src/renderer/src/assets/iconfont/iconfont.js index 79b363e..497b716 100644 --- a/src/renderer/src/assets/iconfont/iconfont.js +++ b/src/renderer/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2794390='',function(v){var h=(h=document.getElementsByTagName("script"))[h.length-1],l=h.getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var c,a,t,i,z,p=function(h,l){l.parentNode.insertBefore(h,l)};if(l&&!v.__iconfont__svg__cssinject__){v.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}c=function(){var h,l=document.createElement("div");l.innerHTML=v._iconfont_svg_string_2794390,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(h=document.body).firstChild?p(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),c()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=c,i=v.document,z=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function d(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}}(window); \ No newline at end of file +window._iconfont_svg_string_2794390='',function(v){var h=(h=document.getElementsByTagName("script"))[h.length-1],l=h.getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var c,a,t,i,z,p=function(h,l){l.parentNode.insertBefore(h,l)};if(l&&!v.__iconfont__svg__cssinject__){v.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}c=function(){var h,l=document.createElement("div");l.innerHTML=v._iconfont_svg_string_2794390,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(h=document.body).firstChild?p(l,h.firstChild):h.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),c()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=c,i=v.document,z=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,M())})}function M(){z||(z=!0,t())}function d(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(d,50)}M()}}(window); \ No newline at end of file diff --git a/src/renderer/src/assets/iconfont/iconfont.json b/src/renderer/src/assets/iconfont/iconfont.json index 5549155..6427af2 100644 --- a/src/renderer/src/assets/iconfont/iconfont.json +++ b/src/renderer/src/assets/iconfont/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "8023423", + "name": "作业", + "font_class": "zuoye1", + "unicode": "e610", + "unicode_decimal": 58896 + }, { "icon_id": "720967", "name": "更多", diff --git a/src/renderer/src/assets/iconfont/iconfont.svg b/src/renderer/src/assets/iconfont/iconfont.svg index bdabebc..d74c21e 100644 --- a/src/renderer/src/assets/iconfont/iconfont.svg +++ b/src/renderer/src/assets/iconfont/iconfont.svg @@ -14,6 +14,8 @@ /> + + diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 409d7e10a53c43a98395d6dd4a50c6f5e394f5cf..3448f74b4f9b5a2074260c202b6a4cc608e5310f 100644 GIT binary patch delta 1477 zcmZXSUrbw79LK-s-f~N!g|@VXLTPE)3S)qU)=uXJY*F;d5uRMk+>n2D^3M&HVTN5Y zXQn2^i6*}LCwtJujKxH=>;cWz}Bfa}WS)Z)ZP>!TL|_s_r+1BLOCvG%WT3<0=B@&yLm zH|@)`xgI+T)AOg-E4Kdv)Nl0Hr)Eb-rhYu~4&R@ne|&o6^qe}3`5O&e_suD0tesZqRop}Tl;fRTuU08PyKSVcHiHqb};~K{P1+gL*4#o z`;5!B&(W`hWum;yd%2ak`f244b+c=r>_hE^UA8)@Rm?g7m#X2)G+N+-qiyZg{*_H@ z;h8)h-g{B_-wkBYjSl9^q7wmTwXvID_Q63A6{yB8^uoV#*=~!b(S|vhA z;6^RHtAE-)Rh(yfb7cWdG4SKiEWp4t&@9TpgwVFY)X)zozw4n-xE*MgX5hx4s|9l~ z+ADCg(6vI5`-b)l=4^DGz*?Zg0;_`FC9po|E`gOoKQFLm=tBalhaM7m4$wygm^?2D zFnNxmXa*oe=a>MKbVNXe`m%s}>Zky=kRB5drH%_|q)rHEqD~56i|K-ZX6h>f;zb(A z1th4i3TUBD2}n|>1*E7m0$QoF0(Ma61ni`~Ca|-hPYCP-=#v6F0-C>Gm;Zk|jU|C? z0{yPQhJjudOuOn21vU}%HG%B}y(X}+aEEIQY%$y&7T9dKdsqN_fY)dERh?1aS(&2s zm8I>Fow5h*ORk7(%=LN2V8xnKa69gGPow8vRd=<&`kMEB-wQSEwT|EGzZAF{e;V9f+$v$w+=rpj)|HQ|Vm(DV2|_`aq3k_ePpk$Z1Wc z()(2|pWT^EISfRy$=*Bz={im@oHUKe3Pyt}7T)R$#gvMLthI2g9OC>|ALs3FyS$adCdqK6w=a_#W(G5Cy&Y@}^7)kS k^C{gB#p?I&r6*NxW$?g6m3kb`>kG4s<2|ci9GFo50h07GvH$=8 delta 1132 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 delta 7874 zcmV;z9zEf(L(oAKcTYw}00961001D+01E&B002W2krYdRu>b%BrbyC53ukP3W&i*K zJOBV0=KugU^b~P|p=f1cWB>piBme*aF#rGnHYln}T4-oxVE_OfSO5S3AOHXWBnRCC zv1n~{cmMz$cmMzZBme*a%*+M<^K5TpVE_OfoB#j-XaE2JXiZgH_HAK!Z~y=v1ONa4 z9{>OVAOTn^0QPQSZDjxe9wYz&0YCr%0%s7TJg{(Yb94XzA7lUk0cijL0q+oKD2*>T;VF$xbF9xP1Pm`r+E6L6nqhDN3^SJe&-)9L@+@3(7h#!nr{&gRPpsfEUoG0Q;I%@^NK!&lZ!rwGmO53(~Q1`bB(@*6OO)z zvyOg*Q;&W|`6}pFxD(J;xF^tdxI2H)PEhK(8FMd)e28pE5#*o>T8~ag=ffM6 zYt>qH1nV|DFojEep@cP_ODQDos zDesD(X*6o-v^J};l1^8c;>qt?(^EWUbk`^|HRaxY(mE(@8SzSe3GIJ=Et!NQF`h1^ z@6VLd=~Cu?$l|9G+7H!aQvG40>4$0Bp#bI!*yLqwWN;c+ zS7H+vpbirm=Lc{X-EW~`DGjavJyEnBQ!8~?^~e}$Kn-Jd<2-n22jJ+13$ z3ol_Jc+V!=H7wiOa%z9>63aBLUJL&=jz8=^R>sxC|C-YE)Q;4qO=-n_3?UYw=@-e( zB!xmKg9gw_v>B*ZYD{`BZcKV^P8rWBv$Kn(nr(4VVT|D6Dpcg{JARew?oQDJzw~0V znRQQ|sb&5pAW4B2gOU_{@kLtcbt1{`B+blD+#0>~^w4}i+!TM1Wk{s{Bee()4!-Nt ze2o%r#!s#7Mp_<*TGycFc&`~KPOv&#&LvdTnKZ9 z37=LQuGVmYtq$P46~bn%`YG1mOZb2o2|UgV1V8mMejk?Z61&9OOG~BKe9Gg3&P%;K zho5|TV??}56qmkK6A^~-zfbaH0!0zRra{Ng7YGlNR8fD*)nOADo8y_Wi&?*Lu3)g2 z+~ALf6~oU&0yr#SqYib0(1ytk{;j@)_d)>#w2J@;Bb|1&RVWYm|Uhlx4Z(K=#x}2_G4GEmg z0b0~f1H2ZL-r#XzF`Skfi}Xs18Q>c?gqSi zwW5#)j8?q2*Gqh^A*HmDGV{^O#Cli#JBfTg!90`5uge*?JjTTh$0oXPwyn*HPkRpw|PNSh+uTUO|yUQRcVN(Ce!7(Au%l6NErOOQp0xKsaG^Z0$pm>OMGNSp(n9 z8R@iV_6Fa0;1`EUS{nj@`0}Y%&+FvAmoSl z`8RSKv4E>plx=dtHmZ|ZkM=o5~%Gs&}N&)RMbwKi?GtJ{{dL#O{@tE9?X14&-En$v&yt2mYf zWeLB&dhh7y-qpRjZvf8e@x4?1pMGbo$Q*HX!UMrwr{fEP!R{bH_?Q&r zd`v$hg%$2{j%7vv-M*2?D*O>SaB)D52O(L}cU&K{6dn_SL6;=z4?uqc4|+t7MC3=H z4QB(_1mi(`bz5Ql4HxK{P>3Z{i36`Lc@OPL$#UA=rg(pR1bd(in|2NRfWMqbU09U402I-;o7Y`9@(+=+Cq0*mia2Hn<+gP zO&CP(wu;uW91cs?GD{T_0=sr~aM_ljku#&k)%m^+efX^WSXXYj`z%XXF5o*57P$z2 z!6+Y*d3>wA_Bv3+a0d)F83 zQ71Rz+{7}BZ%<6*7~dI_@eCP%YV2C zlS)bFJNydp!;7>LdN0rQQ!XE)a;)K8fCxJzOxbauDm^3QI zst%Yi+X}c48%_=186~LBFz&dMs59|=KF+uar*!x+=6l)f+1czlUJB3rr@A(s4ha2l^!j20R^r_ ze}{g7UPQm?ObI&EwYC|5W-B@GNAu=f{n0+PhG~QPrtk^?Tr0_tF96Vhe3*+g)s9$Q zl_UKi2Y+C(gS3Hf25;7syfVF~v`D}5k$$-C?dB8vtIxgXK6uV65-nsHdNic@Ox7~Hlu#&Q$Nnk=4Qj|V43jqaY}1Z^gu)Rk7QXKIGo{)>1_5ICvo8%R@o#OvXmN5hLl*+R3}tZ znpY9jy0uNXti?Arz2PGc( z1=s~VdjN?hPyqiFI`9sTj^9d;Hs+~M0X2qb>+6kG(pc-B3-K-XVs)&E{R6_ zo(ut(0K@2QoD>FziEqkT$-#2UagwD$w+hB)GKVwiK}fTy!DFZS3^+KG`Ke1|)hMG+ z6pItZE_o=G98US?(whtquQ{$(J8lhAxEzk#FT3n^M8i_lwz`sesY$b3XUc%|R~k`+ z94NMVv*ezCpt`TTl5p^6`#Fp0b2s5{z$dtyXb1d_gtL6vvhjTUl255I`Z(gplS4y}e_q5><7>zT`uo!l=-{PgX z?Z!@s^BjKTz6R)ks<{PV|H*9jOWCY@dxL{cfu4JRY0sB8Z`g3sd7rUzsligxaZ;s$ z{|*tO!8m|4tj9PW(!_7`y56|)95+@dSW8E8#opY=(gipM80E}t_P%U(Cp`39e**`8 z*d2!7Idj;jfdVb&2+m`hM*F4O6jNBfeDjuxi7lIfhSD4wcA*Kh2K4`C@MX56yx=1hA~GMN{Z= z$2hZ&u5mWi;w4=xQMa!&to355d|R;DQ6YCAL&5S??NGxaE`UkwY2%Wol4~Ycu$!>U z>78c2em}r~OL1bg9s>oci^BU#Wjh+RLU33=^%UrD0WX0ndbCBAjA{W@5_kE7ecjQ2 zqN4)-eIUAaRb@DzHwrj!*v_fj^&O{e?q5AHuzKKVB)RvjXe_F;zL*?3^R(L3q!1Uh z25SfA5$mhiXUcY3j1c}4`pH&;5JSr5M4j-*$2R{mH!!ejU;uzpSb$DD!ScEaedO`5xL%t|c6)kFi#s!7XkBMp3azIkP_Kwj+c#FhXNM?4U17L4l zi>^CXYEWYUCVz+;1aJixdoDG=0i<3a7#xLCV{*Mk6K|4vdkhadHVgl;=yFJs28!Bc)VQhGEJb09JcP0=p6NbCz)tC z4i&+mB#AMZF>tci-JI2xug8j6C3rXQzmn~*q=hBb^kEJX0SX7-@V{|Xs$6*C)Y))M zHAx}{RnzYai&{JigbEp=BIp8`lhOO?N|GJoGx1;lIw&&3Sm5246;W|4G166mOqT_} zPp?X^eoH>&<>+JR)99xEb05-wF^4=3u$vsf&bKXTkB-LToAfH{&jP8Rr=%Vp8cLYB zs1@n*QpA~Xx>l|B%*Z8I6uM)jWa*vuFk3W_%rYV))Zs*-d9u}q%AQ5P36Sp7ppR}w zx1oEERl?>9)LdJBM%_C!K2@!?{s7==O?=}y-pGJ}dC?o51MK7Y#$Q2yTjt%u@iI0w zhk_uD>X-#CM3?IF1&elrF{%_b7l*`ew;|!J?S}qSU?xP}!5}YiK_OigrH~r*NBk_u z31QXXd^{`aQ7%)G6$3L;w307e?ItPzXAyhY~BTLEyd=3(9jz`GsjL*VP& zf$m1%Lf=LAEhb5GqB3(QtUXGzh_zQ51~taW*2f6nMP`Dh-qxJfWiz$a|$fP=5kBDAWDm(t+?B4gHhMujj&HQB|k4JVsQD?glGoE#RDb6_fENM%a*&;$$!afRLb;*&Nki4ioZ3Q2AK~L&!NmRSv`&Oi@{wSFAzoXJMP_Ec5%jAx>{LcrX{Wn=w z(sOHRsN;iwT1h(+&gdj@^X);Zv(7+ggKzo)bSe7sTh&&_7LPRND7EGkE3Goy9EP7a zPHFZ)9W_)BAlr>}?r&+6mwz8G6o8xwE}mz@Q8r`oSTqrHKfiU`>Ox^W9Z#gj@q|Gv zpAl7qlFX;N<#_KVJs}s>1R~ zKM9Kd@X~B3QZUt!6b_Q0#LBfa;HQ2}_Ty%-_b){I!REgn-Lin?*nhz)taYfPamNna za1_{_1-}NrSl{_Uv`weB4m^`{N0|FA0+O3R@~_ZN*P1a=R2hQ#mnHyYqb6j{GaA7}mdi2CoFFtAG&1QS7 z;O+C3x?6*Ds^xdWT)nk*$4{WoqA#I4{~tWZBP))j1-zO@sDEv)NBQ)ana$R}))v(Nptl~7>T*)0!P_^U z^9a@Lp|BhdvVT;!XDXox6Q!oE#F_~XEZx}pHr#rfD+0_fTXFvSQ!OmJboM%-n4hoK zTU|TFMJK(rfm6ZH*^54YjFuO96Oqk%UQmgGU18{GaqSM))dn|}HSpbLCi7p%7UV2b z8?1?eSFOcSb6xbX7s^&NFOw&M9{Yp&iYTnggH5v@SbV zKd(EkxmXV#o3&W`w+p(Ncg`5iaK8D~S>~6m#n$>$ z=fg3zZ-3uZL|fG!V_U$SYT>50zY>yz_y@?36uLuLZE-$3FLThTI&k9gIoE>;dT|o7 zF3r8i|4hD5R)Ex+-u}pZgRpcLVr#FVl_%F7ejyTzMMz4C$K6V-D+VV%J!Z$_cFetn zq-f*e7oZWf_Uo->ega&VgfVOM&6=B`GT7sRm49^C72Sr$ET0ymw&YHWc1)a}7GqW` zkFT7TtXADLt%FpG+2S;6?mK>(d6}f>t^=&`m@-%`;O$&9vBA77yVuJ3goICYzb+;6 zGJd~|52&;@3u1{a)BjhS%p$W7Jort!;n8Rso!pF;)Z-n=2R3-{^ z&wnbf+o1kyC3TqYsDo~*NubJGcx<-y<1uWu|1XC_O)x!IA-lULdr5v(cX0py+z{!@ z2I_-wUE|e^Y)cK6%O}Oxui87gbo=>RmytC?r!6fHB)5%t|NgO*Cd|f%A9mkMK0@!P z57N=rz$nZkjnQb?{n)zq?@LBDRd6`sUVr3Ub;0=P?lF1tl2g^>zW1-2Y>orTuF1(i zpPWSgX?Oa7k0FyDMhu{(fY%$*>1bzTzbwUs5g=QdS&2)gF~$sdPAbLhoRVX`9kjN$ zW418Ej>lX{{_*g|G24#);Sf(E2LH;duW|;U-=ROy%EK3vPt<>nZ>0Zs;O+^?@_)2F z+|@N~WB;+$k=1sr{^eNLA)b!;$}8R@4t2$ttued4o7s9}Bo=`)1uAm;&b^5 z+xkzL9F47%W)_deJOK1E63M;h|s70Q}z`@%& zSpSUCoe3WwS49bDV`rp>)6Dr$qu_9+c=+!L!{A$4-rdQQlk`yi`jC#*SoVpqu7{s^ zLeTuYCO+{*KoN}4lUP?}#r+>6#9RQqNPWk7N>~hvKEIEIB;CA6OKQv+p?`oMlYkI< z4>_o$yN!KeAsu$t#Cy1X>EX1J={88#C}tz>vp#|`!?|nx4CDWH$S^|txbFByJ!7ns zOjBO(SA>vmbOrtULb@J0{4}0m7~&T~(Rfi&q$n>i?!U{LCO^iAp|Gk5%$CNU^MgJF z^oXG}=rxa1DH&!|*oql0)qjCaRa>FFSILn>^PLi zxtSbv5^&ZhsH(Zci8G%AC0%%l`3JXvpG-Iho0$0=xs_x=v)b+ZapAFP>|uu5VDuSv zO0xAsHVsYL%(!<=!6OcN+H5@GWRKL_UO&cbYIH!&|D*T-zLT!R%zxe2P0p;3`vt+z z9D)>|Cir{&q6mr5x^F-82FNv10T%-p0A1q)I8FEZT7^IhHT!YxdLbv`5-y8bQ*a-| zWdR2nF)O+cx)0GRTyh_xRj-Po`w%V(CNw?dJ}6`aB8s>SIjF&9Xvv81)c*xgwoYsS zc${NkWME(bV!@}U?j*z#Y6}<(>61%wO?|G|6)04DMRPqY6XMFD@?cGEBr^hCDfB$RT$LxGk%0ZMt{ zYdEsCk=L~)9V<#~e?2mNWnXr*vpcKVWRcv&I{ANGVF7^@8FDO9V1+d{xP=qk#wqUL zF7Dwz9^fG!;W3`zDW2guUf?BO;S8_w25)hW3%tX7e85M1!e@NJS8VYO-|+*N_=zk0 zN|t{E%SrO@ybj75y^2qx9anOx$!Ha9-h_sw&FUaa&N>@B%`+p9wDNUqo>Ac=9U-li zG$VDkl%{Ao3dHJW{9S(}$}UBjC(m?K3X%~r?*=d!BE`&8L#$al6? z)MqqQ)C$eJv~i?GFA>5;@=TQ8;bcy`kF3J<`WEoCLUu)RuW%RF$GpK`aV6f gQTDj)(~|Wrrk1lZWs3{=0Q<`?dAxC?=ZPT`ejg92TJ%gu;QWWz&RC-sKea z#Uo?!AOVue5}Mr>P1<`)Z}}Zbuj$264|AECgl7!b)=)zDk|YQC7K-eT^p#pREEH&c z!1PVhFAq<1`tJx7i0H-c5@JLQ*95BrN$7B|K|PGI-$H+xfL9E!&x6onK@efE2CviP8_)9FY>nt{g-TZbL>ze4{Dl5cn~ijIQMijU+&Ws8nUad6!>EzU8bi=Lv>{L3Pq6AR~7bUA$_bQ z`zRa7UGe+$zs+<+rp)oTZa?~}s{aqcKWnCHiu_0K_P2rO8A{|>p4pI{tH*RGkJDw5 zH_E=*q*lxtSEwS_tQ`%VoZ2euZBu2BT78Bd)fU;Bp8#Q{4HIL9_`7_a%v!c>*NHy# z_+RlV>sBqQw`Ey}Om0ciqSC3%xA+j+_ zj=4c8m#L@uR7(B2bSQLd(X5H&)2~g7POX~tXwqefkfsuDqh^w&)x%zw18KpXnFP=U zWocD5Rv-rTd0Vl$P%Z7_vSJ2cStji`CDt^|s!hJOUw^H+iZ$$aT?Gbo6|V>gvWGQ< zagy_?Xi`L?QOxSeZH+22iW8QiGjOO5&a9Io%DfKQ*x0zuT}1@rmm3kHVfaYpo2L*x z2zf+tm&62t``vYTc8P;JNlcWXC%czR-%LB5c!w24kyfhf!+^LY3}vcTtBtyof!2dp zSgl~*rjLd}+jK}0nZjbX(xx>CIbL@D8TM&7ET}SD|NYTXYj@^;G@5@pC&pEEsMUy7 z`-KCI9XI$bU6%|tbzX~=oq8S7s*%&|freA3H`|<1HRzZ+09{Wj9WxH72^_)p7qq@< zJeIosbeHVt<6mL2a`$?*VUOLnNpIYHo_P#s!E9MFliMd8!^+7?fTAURrud}gfmk3r zGXp`G2z=YFVdjkbW&k#t4Ey(#$xfd!+1O9!6+Lq{Q$68Z8vOCJ$CmA1obuHjSeo(o z_sx7bqyA#!)76X93jNyU8Krl6O176#J&2}HBz(*HFnF*j4(@=90mOy8?Tf7y_?*W@_Gop6Owgu~*m755rSx zeIarJ?n$3fw6j*NgWNqBP-k9RDRif;)B5s+YTDnVFHSlUocOge&h%HUNK6-__L%HB__?JU!n<|I04egO>}M6OmhiAp!Mq_8#2 z{2A8z>1Af3>3PbFZ~b)pMn&aTNh-MOz6)n32Em&!D|f5OGFdP^9sN_8u$7YzKTl2q zv(14c*mJ{B+0fafJj`*d7`su?8gR*AstVHqZ}1&03KXB%pzeDUH-s}lj4z?=Z}UEx z`5H2Pu~N;5t3uIJbv)>Pa@}~Rl{&l}%fTAN-B<^MpoBO|VhG`I+IJyhi8crB5~G+{ z0S7TU?BiL3wt1uV$=sn|V z6IBS+w%AorFbYXkwCv;krRF5( zs1I3Qqt;yZ+fY7i;4{PpKK&#n@^!ISik{%IIqmcMQ6K~TEenoV2wtz3tMBYpj>f^2 zx-7}oYY4=bGv=|M#`>si5R(34>ETh30Mg!yRM50j*#L-Ej z{yK#0Lq`cQJRKY*GK46}-n7kY<8#Z!WURd-!jn8q7GQIiUBH6wx*=J$huJ@7YrwON z-GOiXW$fhsU;jO3X#Lam26i;;ZK?rL9Yk3G+efnH;-}aVJ1-_nzF5LSwIbZs9hv8d%5W^tQj~EgkemxILm%anv@8HlR9YYh#3TFoTbSiv)J27-%z_*1r8hL`D}&7LKYE+}Gg2^o_W;K+PU8YMLkQvZd!aU6 zb*O_GA21G1M6rHC_Es4Xs)5q#n>Ps%cCBw`Alt#-YzSD7eNinP>lhc;)!73E{9|ur z$2u~6*Dpv&1X~aZNX`;@i7vS)8X0lw#P)iSSI<1x?8_$u@vS$V?n#aBP%!69&G#5g^=WKl?*S9eTJ{zN^GqT)NC(iep3qNKn za^pxXH@0bhJ)MeVy8d%9x`qUt7(z)Tvj+0NguknDzKzqn{tz_b`@IW4_@_uU;PLEZ zA7=?YrzOy-MDJ*Nlhnz!6~U9j9}dz)VC?-4ND&%cA=E=E&~=&Qx#7ndU~kjs>7rAo z+{jA8$|QZg&+ky_h)ZjFUL6&!Sr$&T3hC+xhVoa0+61f?#qT!8iO9dLF_Iss;u(EK zi<^x)Nv-E;0jF}oK*=S#Bmp_jp^$|hl3Y&fmYMR#R1aMcK z1Q0ITwzhRURhzgpRMK;}&B_?~ zDuVWqv5_7rK<6QWXW@@yzwTq;m%zcZLu~lmJ5aruD2xN+iS$4XL_bsUdPeeJ*Ra`o zCDk-1S);fO>v=l}YAU0K3JdJS_ZF$I{_?p?7$V&Dxm`gxk4+&|1k4Q#Vdet9!t7B0 zkh%DoMA?K`nt(ZG-EH-91+A|rd3j{tm;3UBBw?h=6E3nf7k~3VE(M_w0`1{ZD{TR^ z{CmnX0&E7<|G#9m&*R{%JIQ8o0Q{0X;jwYn0}22S-4uOu$W5B(Zw$Lh4+0*~e8e~X zQM26dzDk#xb6Hf>EulARUZ^>W4kSF5^{|h-8z~j9q>sWw@EDy-9}}aD(mDQIp6^|o zA>LhIUL4{L*|2L@5W!*Ef#GYkVfZRsHf+O|UxWfKE(iXvsaaXemQ!y(p$I8V9aB#( zDW&KbSqP<5@c0QE-K0`ED_!yT9Ir2jm%-QL6RyL{?NM)#RVsj8$GOif;XL4!a0Pkj zZIX|5{Tq?ev#)fuQML8B^#kh(hgkl$V(+UTC=nI(asxky?r~a$`-&Cr6|_ciBQ3!6 z7F0kpwH0uT5trim^LR0`+#{<4s^gh93-^#M*`-|l_M5#5d1$CST71_=$If8)>#HKg zq$2Ix9;!8Ore&-6%H@X-3zk7+ot@pb-I)&_Y#al=^bP+-Y&e=>f7B3BYF1NI!dh&; zfCIf7DR=(2CLfzbY8(VGWNf z#$juZVC-+#X8uda1VM;*7CaXo6h1$B2DBWfXV8zgfYD&hvK|7DG9sBeoG7!#x7OR< zR{uE^$KAgri;1x#Iu+fQ<_~_I7!m@}T-KZj;Nd}P31x^o zUf;b}1VlUyB;&xwmU{}S{3W-& zyj%}wd|e*3Ox^-x7972zt+OA!&FP+cVmP$A(eIV2+Ik!7FHH-2*Pr%ElYB|wZl9>yE;hR z>=CAuIeI606x9SN#TuDX85SW|B}*=Piv`#ke!WHzxWw9dOV-D39VIpYEAQY8>J4fJ zaKV84I~KP4??5%^0-{BCpju=B)p$Gc)%>JxehNQ1#jj0`1yKHm^V9pX-k0J_8pn=o zz8!z_CS7p*84nSMvD*~0u6L**T(zL z^8dt4wGW9A=d_eX@^fH@p-kH)cLVP-MC`-(r}B`B#4L?vPWMnUMT~d#HABe$?|W-_ zr7QxDP)5PI)mJTN8BEnYnfRDi>*)IXHwx*r+boJ@@;Cy874EN~jQZ41lKV_#v>a1H z__+T-@$WT=Y$|Av58|gvqpY|4MC8}PeWLxu^>2}uCZ5-7=CuC#aGJPw=+sa)YxR|NV>^Orl zIkT+Xe)~^&$`(9l{pV0EvZ+qJJCdbbdW)7wZz7_-E10}*@1^{c{N@wja`{>Q{)wzL z&CG(XX<9Vb#4^FFWJ}?tO4?3N^^X*YYp-z%=Y)iC*NS$Uch*nE3@QP0Qb2`zFOD2C z`;@o(Ez9Aw>W7l-Y@z!~FP%Uhpa>9b{@Nlty6poIbfeh)ZsWdndVY?n@+HGn&RY;H zW<6H|`}(wBp@}>Ly!f1GGc$hywQz(i1P<|MR-f6B%^8^YoImAp3g>}4#W`c1{p+ip z8_B|vFj$emTq3>K1Rky(=P0?nwK zo>cIOifbOd4rnKcC;P!0^8r zr|Zr4*>6hhHQ5(JIs~Vhl?vo3^f91RW;HtH660d)&a7sT_hGwA7WU#sXv~t~TX^^n zyWdzW;sWxVF-OEwu!K>%iG7{Ju=q`RvX}pbvef*z!?*j9$Na}w-1o;ElQvr#SpnAq zCJ&9RzBKQ$YHZb|L!bZDOFODRTx|Og1l&}>zW+{Q!sJj0lt8PQsStixmr&rq@cBH? zpdf$ZsNPPItOL?@Y^OaO&y)t7YlKPN=X!wVzv5SDHuI}FtNPsc*o?NX_8*^K^ULro z|GN#0joQdn?F+N|RZfLV`$IPC?$}N*`HDdKw6_tLS^S7WrQLy+VlL9Qkwy7D=C`r@m@(X(bDe z)8ZfBcPBC=Km|t(##&0gnthQ5dU*~oYGB;pVTfkSz?UE)I5O@Jyx8lfwh|yFTw{(9 z#S^&5S7z2y8PO1mB9^EUEuG)}V|3S#x}4r+NnIE0{O!7+^+DgRx35|?za`Z8d4s+9 z4Sc==`)OMA1v$^!Ib21qcCM|otHvoBY~O6MgBvJeOYr>y8p29G(;4~t>(4dSB*63g z7cL{%IMS=xW+GEQl*px;v6+qR+_hq-eTmy2ADk}5NVW#p)H)pH1_W>u1wyA)ELzRq zoSBr7Ei(r^POez-JwxF31DkPzK=zDe$9=QSeL^6{_r9D?U|JC^cw{9-`Cy(F9 zUuR&__r%{ZRLp2C&BJjR%- z;OFr_WbLE8z4(CNrfJcV^TRetSN`Zue?o!y3KTmN{JLqYGY#-YT4d&OxT%_19jE@P zU=6lU)1rQ{FjHkc?5495SJdL6f_bDi?kxmqZ^ zB65ZW6Jfr)^tVxW@~ilIamrT8b<^xMt(lm3F69PuIF&{ytdu--4I-=>1cXZ4qArac zW@ZrfZ8{WDac{;u#&PC@EBXH0%=97dyvGk)xOj| z6nL}Cp601sF?b9-E-D@;&ky-l)XmtyiR7eTpER!foveH{k{HQ@&^(r$AtVox?O`Li z5Sq(A*Xm251r-7p=oAI~&)G%;Fa3WA8|=Vbbdzz;!yk!r15d#kE_J797nMtC6g7;d z9)q?!x3|l77w|ML-0u;VipIVy#0uS_ox+}lh>n*)Pl>489mFfN8^y&pBwdp6)wF3` z+9|n=6S$RsEejSa0;SmVGI4OAVlB2*TPncWTb~!4dhMfF)>ghHC8geRp`2p-TyMw7 z~g-Us&Li;;=|zb%VZ5tOTHX-8RxSx z!xw)!{Ia#>K^!TXbj2cAK0{fOm%LR4Bn?rFIT(-wy*g8G@+(0U6bIF#zax@Q(TL6* zXCibl_D-}gnG9c>Oj5H#RX!NIf#)1BUp3B>=R61TY zHUTHV4-g$fL}Na3NEF{Krytdz0iHW>gJK4(I<4eZT~-5x->IG8$GI*+_bwz%{0x3q zyEr>{5}T;q{BGw|C?k1|6HU!v$0E<;C7`y031eJb1PYKIohRmSAWvAFU)*ld7657w zG-0>^)V}i)Qv^V5(lkbYZ0{w(1Pa&BV}bx6Ctz4Gc#lxCx@7gJeO;K zgyAmUTig}~Q@*&cxHU7327sE;i#2M-088F>5W{byt%KTOZmHSFzq*X1k-PC`BFX2S z749D~ZNGn|QBd@J=+=It0Q^uJbDCyiSTruq94NpSt3R@|uxSk?Eod3X(o}tmn;?FYkJN>)|au*s0q&`<+ahW`kSk?yT>(pAi3U} z%qIC95i%;#Z-OMdK}r_)_9yCMAXX**VoXGvxL;i_E`CRcv5OpO)(<%kVu)Ise)F32B7^A`<>pqr@=1 z_riu%>j?NRI+W#1%rBW~4_>C~KzJn5MV4^O<{`#PGU0i-K0)%L-FUo(?mby^dV3Tr z-i$BX51;6@OUp;!zHw$!X}V!r-*A7dY{&I{6jU@YItC^dHUx@;%LWghfRKnSF$pOd zIRzyZH9PhkICA35g=@II@P_w?r35?BW0zGFJAIrzq|=@x9BO=ms&F@ziGbU&Ku@jZ zk`Qm)Xv5<)HpDSFqQy+$i2}DwmV0nVhP08S;dG;JQxx!C4x6{gv2;VSt{=)Y(dky) zf>9B{UDwGobs#0C)F_r~H?UC{TU;fYTGP->9(6tQ(g)Vpmgm~5q4qv^9{d|in#5tP zeNuIVSX-`K@8sK=6mqkgRPE$+vv5?WX+(50;|L3k5QH_FX4liv2DEQnj;5&T3-8Y_ uhPB{Mo6@!Ik-qR~FQj12u9pir#mlvY_1}6Ko>ZdNgs&Z1X*gj80000*KqT`3 literal 7052 zcmV;78*}7$Pew8T0RR9102_<|3jhEB07Dc202@010RR9100000000000000000000 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 -
+ + @@ -236,6 +258,10 @@ export default { display: flex; justify-content: center; align-items: center; + .icon-zuoye{ + font-size: 40px; + color: #707070 + } } .prepare-body-main-item-tool { diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index ac5400b..23e0c33 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -68,15 +68,19 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue' import uploadDialog from '@/components/upload-dialog/index.vue' import { Refresh } from '@element-plus/icons-vue' import uploaderState from '@/store/modules/uploader' +import useUserStore from '@/store/modules/user' import MoveFile from '@/components/move-file/index.vue' import FileListItem from '@/views/prepare/container/file-list-item.vue' import { getSmarttalkPage, moveSmarttalk } from '@/api/file' +import { homeworklist, listEntpcourse } from '@/api/teaching/classwork' import { toTimeText } from '@/utils/date' import { ElMessage } from 'element-plus' import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile' import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue' import outLink from '@/utils/linkConfig' import { createWindow } from '@/utils/tool' +import { uniqBy, cloneDeep } from 'lodash' + const { ipcRenderer } = window.electron || {} export default { @@ -104,6 +108,10 @@ export default { }, // 当前教材封面图 curBookImg: '', + // 用户信息 + userStore: '', + entpcourseid: '', + timerId: null } }, computed: { @@ -114,6 +122,7 @@ export default { } }, created() { + this.userStore = useUserStore().user ipcRenderer.removeAllListeners('copy-file-default-reply') ipcRenderer.on('copy-file-default-reply', (e, param) => { this.callback(param) @@ -245,7 +254,7 @@ export default { this.isLoading = false }) }, - nodeClick(data) { + async nodeClick(data) { if (this.currentNode.id === data.node.id) return this.curBookImg = data.textBook.curBookImg this.checkFileList = [] @@ -256,15 +265,100 @@ export default { this.uploadData.levelThirdId = cata[2] this.uploadData.textbookId = data.textBook.curBookId this.asyncAllFile() + if (this.uploadData.levelSecondId) { + // 获取作业列表所需ID + const res = await this.getChapterId() + this.entpcourseid = res.rows[0].id + // 查询作业 + this.getHomeWorkList() + } }, + // 打开外部链接 - handleOutLink(key){ + handleOutLink(key) { + if (key == 'homeWork') { + // 查询作业 + this.createTimer() + } // key 对应的 linkConfig.js 外部链接配置 let configObj = outLink[key] // 通知主进程 ipcRenderer.send('openWindow', { fullPath: configObj.fullPath, - cookieData: {...(configObj.data)} + cookieData: { ...(configObj.data) } + }) + }, + // 根据教材章节单元ID 查询作业列表所需ID + getChapterId() { + return listEntpcourse({ evalid: this.uploadData.levelSecondId, edituserid: this.userStore.userId, pageSize: 500 }) + }, + // + createTimer() { + this.timerId = setInterval(() => { + this.getHomeWorkList() + }, 1500) + }, + // 查询作业列表 + getHomeWorkList() { + homeworklist({ entpcourseid: this.entpcourseid, edituserid: this.userStore.userId, pageSize: 100 }).then(res => { + + //以下代码 参照AIx web端 作业布置 + let list = [] + for (var i = 0; i < res.rows.length; i++) { + + res.rows[i].taskconfig = []; + + // 找child + for (var j = 0; j < res.rows.length; j++) { + if (res.rows[j].parentid == res.rows[i].id) { + var ss = []; + if (res.rows[j].classworkdatastudentids != null) { + ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']'); + } + var js = { + id: res.rows[j].id, + classid: res.rows[j].classid, + classcaption: res.rows[j].classcaption, + parentid: 0, + worktype: '', + workkey: res.rows[j].workkey, + worktag: '', + entpcourseid: 0, + evalid: 0, + edusubject: '', + edudegree: '', + workdate: '', + title: '', + workcodes: '', + studentlist: ss, + deaddate: res.rows[j].deaddate, + timelength: res.rows[j].timelength, + weights: res.rows[j].weights, + feedtype: res.rows[j].feedtype + } + res.rows[i].taskconfig.push(js); + } + } + res.rows[i].fileShowName = res.rows[i].uniquekey + + // 注意slideid>0的，这一些作业是添加到PPT页面的，所以在作业管理中不能出现 + // 2024-05-15，酉阳，jackyshen + if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) { + list.push(res.rows[i]); + } + + + // 如果是习题训练任务，则检查一共有多少道 + if (res.rows[i].entpcourseworklist != '') { + res.rows[i].entpcourseworklistarray = JSON.parse('[' + res.rows[i].entpcourseworklist + ']'); + } else { + res.rows[i].entpcourseworklistarray = []; + } + } + // 去重 + let ary = uniqBy([...this.currentFileList, ...list], 'id') + // 深度克隆 + this.currentFileList = cloneDeep(ary) }) }, // 打开PDF-课件 @@ -275,6 +369,13 @@ export default { openLesson() { createWindow('tool-sphere', { url: '/tool/sphere' }) } + }, + watch: { + $route(to) { + if (to.path != '/prepare' && this.timerId) { + clearInterval(this.timerId) + } + } } } @@ -330,7 +431,8 @@ export default { justify-content: center; position: relative; background: linear-gradient(#b0d1ef, #3e7bcb); - .top-zoom-style{ + + .top-zoom-style { position: absolute; width: 90%; height: 30px; @@ -338,7 +440,8 @@ export default { bottom: 0; clip-path: polygon(3% 0%, 97% 0%, 100% 100%, 0% 100%); } - .textbook-img{ + + .textbook-img { height: 120px; background-color: #ffffff; padding: 5px; @@ -347,36 +450,43 @@ export default { margin-right: 20px; z-index: 1; } - .top-item{ + + .top-item { width: 230px; position: relative; flex-wrap: wrap; z-index: 1; - .btn{ + + .btn { width: 102px; background: none; color: #ffffff; border-width: 2px; border-color: #ffffff; - &:hover{ + + &:hover { background: rgba(255, 255, 255, 0.3) } - &:first-child{ + + &:first-child { margin-left: 12px; margin-bottom: 15px; } - &:nth-child(2){ + + &:nth-child(2) { margin-bottom: 15px; } } } - .to-class-btn{ + + .to-class-btn { width: 130px; height: 80px; margin-left: 25px; font-size: 18px; z-index: 1; - .icon-lingdang{ + + .icon-lingdang { margin-right: 5px; color: #ffffff; font-size: 20px;