From 97da162690c790cab03617820ddbc3662f77743e Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 1 Dec 2022 16:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/assets/人员信息.xlsx | Bin 0 -> 10096 bytes web/client/assets/项目信息.xlsx | Bin 0 -> 10269 bytes .../src/sections/article/actions/article.js | 23 +++ .../article/components/import_model.js | 22 +-- .../src/sections/article/components/modeal.js | 9 +- .../src/sections/article/containers/index.js | 112 +++++++++---- .../src/sections/homePage/actions/profile.js | 6 +- .../src/sections/homePage/containers/index.js | 156 +++++++++++------- .../src/sections/personnel/actions/article.js | 12 ++ .../personnel/components/import_model.js | 81 +++++---- .../sections/personnel/components/modeal.js | 105 ++++++------ .../sections/personnel/containers/index.js | 100 +++++++++-- .../src/sections/wait/actions/article.js | 56 ++----- .../sections/wait/components/import_model.js | 2 +- .../src/sections/wait/components/modeal.js | 47 +++--- .../src/sections/wait/containers/index.js | 139 +++++++++------- web/client/src/utils/webapi.js | 12 +- 17 files changed, 527 insertions(+), 355 deletions(-) create mode 100644 web/client/assets/人员信息.xlsx create mode 100644 web/client/assets/项目信息.xlsx diff --git a/web/client/assets/人员信息.xlsx b/web/client/assets/人员信息.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ca46634ce1a43834af458de5bf7deda64973748b GIT binary patch literal 10096 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 J0Lhc~{{fx7WHkT) literal 0 HcmV?d00001 diff --git a/web/client/assets/项目信息.xlsx b/web/client/assets/项目信息.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e95a5dd2623f7b18de3557909beda01b22112886 GIT binary patch literal 10269 zcmeHtRZyMH(k`&j;I2V}yAxcqaJN8kcXtmi!7aEuL4v!xyIX+Z9-II_Bzu3t{{CI( zT%M{k7rYd-%sk!G-8J2^5&-a5AkQmMdY%9I`|kzw^ozcgo~*5vwH>|e6B*jmAE1Ac z#h3HkaDjq=n1X?TApMn0$J(0C*}^c&#NaJ zh|^=_`x1+Di^mL3;E3)*a;FC0^Q3X8`3k|O`9W_eGzfml4|S>b5x>RvY za?EI8e#9N-$nEw|IQ>Pgm<5-1+!VHqG0yc13uE5A%@3}|s0s_B`MK?pOQqeJlLm+5 z!B^Y8wX==ZFh=bWMyUs7m({#TF_uI@%iU~*w%~f7tuw!Zdui%Ve4}rR;kE8XvLPOE zhxnMyyBc3r+2f@aRkd2=mfv>e8|2}IatiTxpm~|#0^dCWE${?1@?U}0v$8dKM%q70 zK%$cYE8y7YF>`Z;Y{qZ<=IvT(Rpc0%KPwL_0{O+VC7Dvib+ za5WsWeHSgITojVl)=)8{_YT$P%~)1^u4d@C6l0i-+$Q&I^!w@n#t*(iF+Z;P& zI^s&;RkVCQfr)XE4PntXzlGBykI$%+5EKfu)>P~EU|)b>Q|CT`Sc{EBR$i;$OxvJk zVB<6MDul7}`Ec2@!L4 zZo(r_m;L)6lRsYgc4g!hH~ACf2v3ls{ta>mJ9{gOXV7z_MxQ`O>wN-UsGnyzqEwA( zAw2hxpPPc+iQc3EeIbWs*FNa65!)^Vir&@Tef93d<(Ra1wgooaw5nvBl8^|}dtzd$ zWF>#irO_J>d`79ElrvlDmGpp*lA~J;cetT!wpkoJx8NcgUJ7nJw5p4&hk+1*Svrg1 z0rmEvO@!oRl{~tzbn^s)T@o8~GwRgDAm$I*}_i{avn2E91HEndw?;)^7>qSFB zxs3?$dk1@)49}Uqch+|Rcy{G~4lRHuT%FB-0sqeg2)_xOtZdEfj13Iz|04h`W|by9 z8Hg1U1O)3pXn(OVK3ghGanN#+0jUXdhYzVqq{5uk1a45kl-$@G13HO!gr&M7NcN4y zgz`e!adeeBwkbf1#I%~Zu@aHaQVU1yQu~Xng+QggAWW5dT-Gwi`QmKgC#P7I-i2tf zX+Z%m@7&tKS}TlHrqLQmYjErjYGVr=JTeM{X2uCpu>ly5iUTY|-}2}4lyS8UKvkCwbe$T0U)C&rl(5_3r`_h@ znVe_Xny{);yvC~OodPKnFq_U5@f-%WPeK|zi7)uFnnc*jC$j9Q0y24FdNf$TDNoGgjBK@0sb z7KK4y6swg#3#8D{7{gsyY$-Sb1X&z1#Href1ut+=ez*pAi@dJPm{h=xMq{~ZuaCxp zNzXy{+@Um?lTbv<)_1XG1&ZSrIYOtt&Or9t1ob;U0!bpBEz>K92K7D0|G`Pf2Xe9u z$a{o|7M9EW(lR{gFZa3~o!_A@)DSCy?+(THz_c0hxGKJcW+!AoICnMdt?k(mHoE?QS&%DfiTc9%#g zPW>w9&)WokQ3Gd*)*D)#Z8b`)=3nvQRFa7Bt8xnX&IkPcFXx&oN!v8IZe`NmGS!~ThMe?weQ zJ&wC^^9wMC)MaZ003Xh=+qPQFcM9=NX-7%DrOJ-fX{TQT7*l{{Se&k^`L8hTVo0`O;s)p$p5Z1z4-ZT@O<-xJj9SSJyIO4wnpF~g0CGix&m8z(;VIX(xmQzdO1 zCRoR^3+RX56rycHaRNFPHaB6LThV}~gX2cggB;n+izAnwvCa2zepW2fy5s@kwIbY; z-T6`OOAh`?;*JSIm#T4jr;QTvreaMZ|6KwrkM`S5C=Xi^mmr-&?W|p;pK-w0&xNS^~E6-JDH#jt-nw z1U+6fLXCPoRN+Bmv&8IlZ%25!-ClQRM`(HeC%iKJnT`uJP z2*+SsAs$eXk;1O0k~*f<0pK|5$d)l1$wU)$MI+%mkO2Ttn9$}kgzeKJivG<=;2<`)R^$&i@CMEe5Peu;FrIZ^xluA&lmL=a(X3a{>+OZx~njvG`wqRd`n^X>9j+&K{UWwRGz@3dD}ygReC_zKpMFu5FXOQk-Ntf!V+HUlD00jOAP2( z4ROG9+#L3~0y@nFrr@=d2nJ?MO!rR4F6-W)1L6(4i7PQXRi|F;$Jty$u7yhTY}NIawCD1NP4hDdYmSPb_p#<9rA}V5~4kI+%koetCHkEdK6VR z!$W#u))i`U-_-FdV?4>jkH+5Anh60JKE1Xau%{dQP3`l(O(HVX3`|?a0RHaE;rJM#iKAGD<8|bgB;d>cmZRIEC5~6#= zOFk-hVM(lg`0CNCjG8ys_kyUt<=zFnM!1MMusN^s_&4;SEEr7WXR1v0b4ubZW{j40 zx7;JJ)Fd2HywWG;T}*eI!csrXeXV}2W^8(LFplP*Dd!l;7|zI-fbKQ4?z_0Q zLwh~1-4R<=1#i3|^Y@~rG^zK2`zhxcOM`&G|4wpt_AcfIcF&c}w7Nyaq6+#$c$ZhX zdOK8?J26_?jWf7 z-bumPpjiyx7&y{~ZwV<9j<|a6YppF}je|cGAd;zf6(DN7Hq8PwnS!j@A6!&>FxH08 z%AA51_MD0jJCA7e?i#K8xjzn<7bsNr(hY&KR3SWn#SE$vkvRey3p5azQJ z27hL=0oih>=0s8-U!cGEw&D==D}Af8AOh2#Vau>_`c0ZT1+*|VB%~TkHl^^JhiG5M zRbo?&cL!iJaSdF&gBGi8m6mKyanxZmV4dfJ(u$uZoMSh7 z*ez+H)%L}Q)iRLIDdUy;dIq6nYVC{bxs_`ovDM)l*4Jzl+b!r7k|`E-lT&=nsUjfj<8Bb5ndrH zp^f2W3184=Oeat!j|NDG<4B#{V3IWK+N|_mYFJjv&w#IG{=#kKD`4XU65n(hi#P;q zWPFuIL@G6D9-LXtG<(`KF`!h}E#BDh!za$+5lxO7wt^Ce^64oxLm@y6`cORS0#3w& z&P<)W_%~kn8$+hV$~WSw%J~Wixe4d0Fu7Rw)P?f7=$$Nf%IjNOA+r*F?v0a zm28NjKlhM!bXSDI2yWR|=o}kD#26C$ogBkQ-!wA<@Rq}N9oi^SUL(?P^{Cvsri0@| zp6|L!Tq7wdSkkM~mX=_J@6rH4;I*iDnEp{Xk=bub@XB{WFf-a%^pA5d;8N1KaE6ki z9l;@!x^bk0OmG}Zyt$e?8c_Avw|nvqjCT+(GFj2$*i#@#t#@oTVP8S})PX3t9-o#82^zBgW$S*$Pkob=~v52p}hjkWWwjaL(oMmU@*|r;Lq?hVwrOi zggv&;fF6J-WU`Uh84{A~=zwv|#QKh+ZnPGLW`=A4IJQ=SEzlKIj*kce*i3+cQsTCU za+uQ)8TGMcIlyvIrHH}%U<3Vs_Mf2S;lPO2eL%}rax@WPz;v`!+V>;e*GBI2rCmqa5vL5<>CLNl6DlVnPd4xi1H2PT z_Q4W&b!Q=L@jvTeDI^RI(!x+Fpt6@KL%s2p^_5gBD}wk)jbhRhW?CIk(AKE`5zNhc zq5&K?FHyVmqjos)=M<7iII-$Yxj5c=eGiBM1x58E!FkohvV;~SUDaWI19<^o&D=B!Gh!Z;>GnOnLr-4U&Yt`mDahE>$W+IG)9}tXYCOGj6Y6U*|8u zM1Rlf(edYJYNWnyMmL!wJ@0W*!{_tj^|&of36NeOsK-AzCiV6k=1}$CZA}YLe>}e% zKt#o62#spDk~J`3`EE85!1D03a(DGu#?y(@^YZ%V24a5ePemVBLEVruZ>pL8Pi6fN zkyv}@-?LAB$%DbEfQn#SCiN<)FjJ}WFilqUu=YPs9*Qv$dt0w>ZlI2t$+864;<_4@ zDx-S@QO6IW*s?al?&pv^kL6rGRIhEc~hE0Pf|i!lw}qpl(Psb3_2o8VE?M@^3?O?l<%ugpR?J!GL1RwkKZsg(o_P~a!Ljh`L2>eZq%#qZ?wf@hO+6|~HasrRE zfwKe9Hn906D)5@Bk(Ns zwctmcX;;Uq!cNm){8CYDCO zs?Ex;WqreP6cV&lBSWK=N=#GCvht$C5+gGGLlU)0ui$Mat7YXW=){I3#D@AuC90K* zBx#i^YB#=DP}0%Kf$R-a*C-88P*Rpp%+gDbhz?89%nZ_t4g&^qzGHqTiwCI(?%sAo z01JaDyRi!kN$WXog&`pgZ|j2-UBqAY-{iWG)`;hczshw<^v^9EVQ5K}vdK%83SRy( z5^iKS)1*>+V$w^3dym3}>k-NR?nrfZD!)V`{b1pu%8V^wsVP3c(TOLy`n~-ulOL}~hSed+-=SH3Fk9q*f`#L$F@pFTn&$?Ju9cP9 zuh+yVjpwdaz%j(5P+zmeqD7Y8A;02M7~GW0>*PsR8ZDB<)W?+=jK+4$rhyx07w6TO z?|TL4H;@E5tfa%_*reK~)H(BU=NtDoTj9}2^~ma~0MdJJ{`b=t(-oDTj|PWngl&G& zHH-}qdYP62KN!9uz**w#vqsF_zJ?tEU}i!Defauj&@yprV$8ezO}1n8t8f!8GZ;Bpg`H8sAI+S0*%b%DN$br(3(u z=~gFfY@3{2XN|$lS|e4itNT#D32LMie#M_|euQQ1!Jk)&*fTjU)ym9GDt6rvb9F_n zoW~O)ee`P8y#Muv`_FHBPj7Z0TDAt}FS}H3?2b*3PybteG6?J+G<46DCDEheT?|M) z$3DkMTP;#f=*aW-^luKN^gTW%NIs5{p+>77wloXK(M&Z!MI_#AC9k^cH{vc6YBJ`9 zH~Bco`S4ryIkw21xI3#X`-pyNo(8xmT6cgq?w#r0`T1^f$1c#3L}|Fok1+*uQO1~z z?<&gjr*p9a^EvqRh<(|bEoChS&V+l?@nxmByH}`!+!`Tm*!`PstgMRmN7i@}vxP>P zsW%m)QXR}A(L;URv*%ioE`X4b9HX`lyo1M1;(=dE3~Awk>i!7|Axq!YTWx3(d)1{0 zLP#@)Z}=xCw>#RS#?`6@MLGRQv-TfJn0mW5<6U@JwM1>tXp5bm9rvHH{MY;FKfy_O zeT04Y1mo0Gn*`_S`*ihxll|4pf1%qPGich$fCRkqfACH4pj|W(f{Ci6^fzBT2l(-L zBB?PY?RI*twtuP%ShJL5^GOuAN*f2>b;`^Z(ZfwS8xaQU%I?@|v6M2M*tmK)Ljuh; zbkvT=+CG8@9z0k+29y}ozjK(3K|vRRG~M#dXZ_CV82@H9J4S3*$VhcSc6VjVNG(%( z!@0Oq3%<`VX-@?Ux>px=kL7&*XKM}pAXzVFx|ie5b%=l70wm1}N1rQ62b*Faq~W1x zkbqX8%Lnv;KxIw4EUbOfyI$5qRi=)951I>SG6}e3R_qoJc7?D$)ZScRbi5>+1jBBa z&ID<~W)H*Xg!2P>!`8ot1S=PaH+D}U;q{Y?J~y+~gsd#>4J_@o6kV(h>@=RkLUrt* zWydpCakq$3wdjnpg+)|gpLpYG<#(a#F8$thA-cf%w;p%#lOjP(j7gF7rnw!d^Fe0k zmPSK3)0Fh9&>vQShgKD_Oon<$YI0uDv=fG+#IZ(xMJL3CFDrwLi33O$ENJ(HAT0s5 zDPYII6!zQ3BrTgUyaPN3QX`oeAy$qZkL#+)KEkBRnw5WBgRx~S6Fh6mSv4car_%4= zaMc+eNU$!Y%7xyHr4L=mwrBH;rP{!u5f6N;?|bU&=ep(8mUk4Eb(-s=Pvh>4o@8!q z@O@4#Fa<8RR|#RR%0*M0FswcgTE0L{IfFBtq&*PDlbgUmVn36^Jy}j;If1=b+re&2 zvy*8c1x8C55B8ftGn5QDirVD33(_mtj~T`GB5rPq2;G`@(8aIlED1x>2%#Dj+cs)v zIX_a^fn6KiA51Q&n$3AG#JUy%O-9ywX$2QNicD57N~0QDDVD}W9y`2$PWK*q-L0M4 z5O_W{#zDc*er2!U<1{a=^kgUyP!PhWpJPP-XtUn}{`mqu2czHXc`}EJ;Lp(Xccm|b z(=*R+rP6=!{JKp4P1*Bp{k@)*J+Hq^4E@SBp{$vL{1(QG7{}}Q3Z-;)KUiiJ953L6NuUUrY*YPXW!Zf9d@zZ2xW3&*LY**RzG)e_QyO`Hx|g z7ry;s9Oaq!x77;%gZIzjl$YCoIR@~j6i28(w*Rjk{QCSF3iv;lV)$f>C-DDrj$cxK YwVGumAbtf7)TcBN^R#Ds;%Dvu0~MCG>i_@% literal 0 HcmV?d00001 diff --git a/web/client/src/sections/article/actions/article.js b/web/client/src/sections/article/actions/article.js index 4ee0707..23b4ae9 100644 --- a/web/client/src/sections/article/actions/article.js +++ b/web/client/src/sections/article/actions/article.js @@ -85,4 +85,27 @@ export function postInProject(articleObj) { msg: { error: "上传项目信息失败" }, // reducer: { name: "articleInsertInfo" }, }); +} +export function delCancel(query) { + return (dispatch) => + basicAction({ + type: "post", + dispatch: dispatch, + data: query, + actionType: "DEL_CANCEL", + url: `${ApiTable.delCancel}`, + msg: { error: "删除项目信息失败" }, + // reducer: { name: "articleInsertInfo" }, + }); +} +export function getDownProject() { + return (dispatch) => + basicAction({ + type: "get", + dispatch: dispatch, + actionType: "DEL_CANCEL", + url: `${ApiTable.getDownProject}`, + msg: { error: "下载项目信息失败" }, + // reducer: { name: "articleInsertInfo" }, + }); } \ No newline at end of file diff --git a/web/client/src/sections/article/components/import_model.js b/web/client/src/sections/article/components/import_model.js index af133de..95af0de 100644 --- a/web/client/src/sections/article/components/import_model.js +++ b/web/client/src/sections/article/components/import_model.js @@ -12,7 +12,7 @@ import { Button, Input, Card, Modal, Upload, message } from "antd"; import { Request } from "@peace/utils"; import request from "superagent"; import XLSX from "xlsx"; -import { postInProject } from "../actions/article"; +import { postInProject,getDownProject } from "../actions/article"; //TODO 下载模板和上传文件读取 const ImportUser = (props) => { @@ -22,13 +22,16 @@ const ImportUser = (props) => { const [postData, setPostData] = useState([]); const confirm = () => { + handleCancel if (postData.length) { + console.log(postData) setLoading(true); dispatch(postInProject(postData)).then((res) => { console.log(res) + if (res.success) { - handleCancel(); message.success("上传成功"); + handleCancel() } setLoading(false); }); @@ -55,18 +58,9 @@ const ImportUser = (props) => { }) }}>下载模板 */} - - - + + +
下载模板后填写完整后上传
i.name_people), - build_time: dayjs(editData?.build_time), - publish_time: dayjs(editData.publish_time), + build_time: moment(editData?.build_time).format('YYYY-MM-DD'), + publish_time: moment(editData?.publish_time).format('YYYY-MM-DD'), progress:editData.progress }) } @@ -49,14 +50,14 @@ function modeal(props) { name="build_time" rules={[{ required: true, message: '请选择时间' }]} > - + - + { const { dispatch } = props; @@ -19,9 +19,7 @@ export const Default = (props) => { const [visible, setVisible] = useState(false); //弹窗 const [editData, setEditData] = useState(); //数据 const [importVisible, setImportVisible] = useState(false); //弹窗 - const tableActionRef = useRef(); - const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date( ), publish_time: new Date( ), progress: '研发中' }] const columns = [ { title: "项目计划", @@ -38,7 +36,20 @@ export const Default = (props) => { dataIndex: "part_people", hideInSearch: true, render: (dom, record) => { - return
{record.part_people.map((i, index) => record.part_people.length == 1 ? {i.name_people} : {i.name_people}{index < record.part_people.length-1 ? '、':'' }) }
+ return ( +
+ {record.part_people.map((i, index) => + record.part_people.length == 1 ? ( + {i.name_people} + ) : ( + + {i.name_people} + {index < record.part_people.length - 1 ? "、" : ""} + + ) + )} +
+ ); }, }, { @@ -47,7 +58,7 @@ export const Default = (props) => { dataIndex: "build_time", hideInSearch: true, render: (dom, record) => { - return moment(record.build_time).format('YYYY-MM-DD') + return moment(record.build_time).format("YYYY-MM-DD"); }, }, { @@ -56,7 +67,7 @@ export const Default = (props) => { dataIndex: "publish_time", hideInSearch: true, render: (dom, record) => { - return moment(record.publish_time).format('YYYY-MM-DD') + return moment(record.publish_time).format("YYYY-MM-DD"); }, }, { @@ -65,7 +76,7 @@ export const Default = (props) => { hideInSearch: true, order: 3, render: (dom, record) => { - return record.progress + return record.progress; }, }, { @@ -87,14 +98,13 @@ export const Default = (props) => { { - delDataList(record.id); + delDataList(record); }} >
- ) - + ); }, }, { @@ -108,7 +118,7 @@ export const Default = (props) => { type="primary" style={{ width: "200px" }} onClick={() => { - setImportVisible(true) + setImportVisible(true); }} > 项目信息导入 @@ -118,27 +128,50 @@ export const Default = (props) => { }, ]; const handleCancel = () => { - setVisible(false) - } - const handOk = () => { - - } + tableActionRef.current.reload(); + setVisible(false); + }; + const handOk = (values) => { + const query = [{ + build_time: values.build_time, + name_project: values.name_project, + part_people: values.part_people.map((i) => { + return {name_people:i} + }), + progress: values.progress, + publish_time: values.publish_time, + o_name_project:editData?.name_project, + }]; + dispatch(postInProject(query)).then((res) => { + if (res.success) { + handleCancel(); + // tableActionRef.current.reload(); + } + }); + }; const importHandleCancel = () => { - setImportVisible(false) - } + tableActionRef.current.reload(); + setImportVisible(false); + }; //删除资讯 - const delDataList = (ids, type) => { - dispatch(Action.delDataList(ids)).then((res) => { + const delDataList = (record) => { + const query = { + delete: record.name_project, + delete_state: record.progress, + table_name: "test_project", + }; + dispatch(delCancel(query)).then((res) => { if (res.success) { // 刷新 - tableActionRef.current.reload(); + // tableActionRef.current.reload(); + handleCancel() } }); }; //编辑 const editor = (record) => { - setVisible(true) - setEditData(record) + setVisible(true); + setEditData(record); }; return (
@@ -147,14 +180,13 @@ export const Default = (props) => { actionRef={tableActionRef} columns={columns} options={false} - dataSource={counts||[]} + dataSource={counts || []} search={{ optionRender: false, collapsed: false, }} request={async (params) => { const res = await dispatch(postProject()); - console.log(res) setCounts(res.payload.data.projects); return { ...res, @@ -167,8 +199,17 @@ export const Default = (props) => { }} /> - - + +
); }; @@ -181,11 +222,10 @@ const mapStateToProps = (state) => ({}); export default connect(mapStateToProps)(Default); - const data = [ - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' } -] \ No newline at end of file + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, +]; diff --git a/web/client/src/sections/homePage/actions/profile.js b/web/client/src/sections/homePage/actions/profile.js index 5334716..5bd8588 100644 --- a/web/client/src/sections/homePage/actions/profile.js +++ b/web/client/src/sections/homePage/actions/profile.js @@ -99,7 +99,7 @@ export function getProject() { type: "post", dispatch: dispatch, actionType: "PROJECT", - url: ApiTable.getProjectUrl, + url: ApiTable.projectUrl, msg: { option: "获取本周在研项目" }, reducer: { name: "project", @@ -113,7 +113,7 @@ export function getPeople() { type: "post", dispatch: dispatch, actionType: "PEOPLE", - url: ApiTable.getPeopleUrl, + url: ApiTable.peopleUrl, msg: { option: "获取人员情况" }, reducer: { name: "people", @@ -127,7 +127,7 @@ export function getWait() { type: "post", dispatch: dispatch, actionType: "WAIT", - url: ApiTable.getWaitUrl, + url: ApiTable.waitUrl, msg: { option: "获取待研发项目" }, reducer: { name: "wait", diff --git a/web/client/src/sections/homePage/containers/index.js b/web/client/src/sections/homePage/containers/index.js index 5d300c7..134b489 100644 --- a/web/client/src/sections/homePage/containers/index.js +++ b/web/client/src/sections/homePage/containers/index.js @@ -13,7 +13,7 @@ const topImg = "/assets/images/top.png"; const pointImg = "/assets/images/point.png"; function Management(props) { - const { dispatch, user } = props; + const { dispatch, user } = props const [dataSource, setDataSource] = useState([]) @@ -21,6 +21,17 @@ function Management(props) { const [peopleData, setPeopleData] = useState([]) const [waitData, setWaitData] = useState([]) + useEffect(() => { + dispatch(getProject()).then((res) => { + setProjectData(res.payload.data.projects) + }) + dispatch(getPeople()).then((res) => { + setPeopleData(res.payload.data.projects) + }) + dispatch(getWait()).then((res) => { + setWaitData(res.payload.data.projects) + }) + },[]) const projectCol = [ { title: '项目名称', @@ -32,19 +43,28 @@ function Management(props) { title: '投入人力', dataIndex: 'part_people', key: 'part_people', - align: 'center' + align: 'center', + render: (dom, record) => { + return
{record.part_people.map((i, index) => record.part_people.length == 1 ? {i.name_people} : {i.name_people}{index < record.part_people.length-1 ? '、':'' }) }
+ }, }, { title: '构建时间', dataIndex: 'build_time', key: 'build_time', - align: 'center' + align: 'center', + render: (dom, record) => { + return moment(record.build_time).format('YYYY-MM-DD') + }, }, { title: '发布时间', dataIndex: 'publish_time', key: 'publish_time', - align: 'center' + align: 'center', + render: (dom, record) => { + return moment(record.publish_time).format('YYYY-MM-DD') + }, }, { title: '进度', @@ -56,53 +76,80 @@ function Management(props) { const peopleCol = [ { - title: '姓名', - dataIndex: 'name', - key: 'name', - align: 'center' - }, - { - title: '部门', - dataIndex: 'dept', - key: 'dept', - align: 'center' - }, - { - title: '11.28', - dataIndex: 'monday', - key: 'monday', - align: 'center', - onCell: (record, index) => { - // console.log("record, index: ", record, index); - return { - className: "cell-class", - colSpan: 2 - }; - } - }, - { - title: '11.29', - dataIndex: 'tuesday', - key: 'tuesday', - align: 'center' - }, - { - title: '11.30', - dataIndex: 'wednesday', - key: 'wednesday', - align: 'center' - }, - { - title: '12.1', - dataIndex: 'thursday', - key: 'thursday', - align: 'center' - }, - { - title: '12.2', - dataIndex: 'friday', - key: 'friday', - align: 'center' + title: "人员姓名", + dataIndex: "name_people", + key: "name_people", + hideInSearch: true, + render: (dom, record) => { + return record.name_people; + }, + }, + { + title: "岗位", + key: "post_people", + dataIndex: "post_people", + hideInSearch: true, + render: (dom, record) => { + return record.post_people + }, + }, + { + title: "周一", + key: "md", + dataIndex: "md", + hideInSearch: true, + render: (dom, record) => { + return record.md + }, + }, + { + title: "周二", + key: "td", + dataIndex: "td", + hideInSearch: true, + render: (dom, record) => { + return record.td + }, + },{ + title: "周三", + key: "wd", + dataIndex: "wd", + hideInSearch: true, + render: (dom, record) => { + return record.wd + }, + },{ + title: "周四", + key: "thd ", + dataIndex: "thd ", + hideInSearch: true, + render: (dom, record) => { + return record.thd + }, + },{ + title: "周五", + key: "fd", + dataIndex: "fd", + hideInSearch: true, + render: (dom, record) => { + return record.fd + }, + },{ + title: "周六", + key: "sd", + dataIndex: "sd", + hideInSearch: true, + render: (dom, record) => { + return record.sd + }, + },{ + title: "周日", + key: "ssd", + dataIndex: "ssd", + hideInSearch: true, + render: (dom, record) => { + return record.ssd + }, }, ]; @@ -132,11 +179,6 @@ function Management(props) { align: 'center' }, ]; - - // useEffect(() => { - // dispatch(getPartyMember()).then((res) => {}); - // }, []); - return ( <>
@@ -154,7 +196,7 @@ function Management(props) {
人员情况
/Information on Personnel
- +
diff --git a/web/client/src/sections/personnel/actions/article.js b/web/client/src/sections/personnel/actions/article.js index 3e311cd..225eaad 100644 --- a/web/client/src/sections/personnel/actions/article.js +++ b/web/client/src/sections/personnel/actions/article.js @@ -86,3 +86,15 @@ export function postInPeople(articleObj) { // reducer: { name: "articleInsertInfo" }, }); } +export function delCancel(query) { + return (dispatch) => + basicAction({ + type: "post", + dispatch: dispatch, + data: query, + actionType: "DEL_CANCEL", + url: `${ApiTable.delCancel}`, + msg: { error: "删除项目信息失败" }, + // reducer: { name: "articleInsertInfo" }, + }); +} diff --git a/web/client/src/sections/personnel/components/import_model.js b/web/client/src/sections/personnel/components/import_model.js index f144154..362e984 100644 --- a/web/client/src/sections/personnel/components/import_model.js +++ b/web/client/src/sections/personnel/components/import_model.js @@ -54,18 +54,9 @@ const ImportUser = (props) => { }) }}>下载模板 */} - - - + + +
下载模板后填写完整后上传
{ for (let i = 0; i < res.length; i++) { let d = res[i]; let name_people = String(d["人员姓名"]).trim(); - let post_people = String(d["岗位"]).trim(); - let time = String(d["本周计划"]).trim(); - let project = String(d["本周任务"]).trim(); - if (!name_people || !post_people || !time || !project) { + + let md = String(d["周一"]).trim(); + let td = String(d["周二"]).trim(); + let wd = String(d["周三"]).trim(); + let thd = String(d["周四"]).trim(); + let fd = String(d["周五"]).trim(); + let sd = String(d["周六"]).trim(); + let ssd = String(d["周日"]).trim(); + if (!name_people || !post_people || !md || !td||!wd||!thd||!fd||!sd||!ssd) { error(`第${i + 1} 行有空值，请填写后重新上传`); return; } postData.push({ name_people, - post_people, - time, - project, + post_people,md,td,wd,thd,fd,sd,ssd + }); } if (postData.length) { - let newArray = postData.reduce((total, cur, index) => { - let hasValue = total.findIndex((current) => { - return current.name_people === cur.name_people; - }); - let obj = { - name_people: cur.name_people, - post_people: cur.post_people, - work: [ - { - time: cur.time, - project: cur.project, - }, - ], - }; - let obj1 = { - time: cur.time, - project: cur.project, - }; - hasValue === -1 && total.push(obj); - hasValue !== -1 && total[hasValue].work.push(obj1); - return total; - }, []); - console.log(newArray); - setPostData(newArray); + // let newArray = postData.reduce((total, cur, index) => { + // let hasValue = total.findIndex((current) => { + // return current.name_people === cur.name_people; + // }); + // let obj = { + // name_people: cur.name_people, + // post_people: cur.post_people, + // work: [ + // { + // time: cur.time, + // project: cur.project, + // }, + // ], + // }; + // let obj1 = { + // time: cur.time, + // project: cur.project, + // }; + // hasValue === -1 && total.push(obj); + // hasValue !== -1 && total[hasValue].work.push(obj1); + // return total; + // }, []); + // console.log(newArray); + setPostData(postData); } let msg = "文件解析完成，点击确定按钮上传保存！"; setMsg(msg); diff --git a/web/client/src/sections/personnel/components/modeal.js b/web/client/src/sections/personnel/components/modeal.js index 8db4470..911de20 100644 --- a/web/client/src/sections/personnel/components/modeal.js +++ b/web/client/src/sections/personnel/components/modeal.js @@ -12,8 +12,14 @@ function modeal(props) { name_people: editData.name_people, post_people: editData.post_people, progress: editData.progress, - time:editData.work.map((i)=>i.time), - project:editData.work.map((i)=>i.project) + md: editData.md, + td: editData.td, + wd: editData.wd, + thd: editData.thd, + fd: editData.fd, + sd: editData.sd, + ssd: editData.ssd, + }) } @@ -46,67 +52,58 @@ function modeal(props) { > - {/* {editData?.work.map(() => { - return <> - - })} */} - - {(fields, { add, remove }) => ( - <> - {editData?.work.map(({ key, name, ...restField }) => ( - - - - - - - + + + + + + + + + + + + + - - ))} - - - - - )} - + + + + +
{ const [importVisible, setImportVisible] = useState(false); //弹窗 const tableActionRef = useRef(); - const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date( ), publish_time: new Date( ), progress: '研发中' }] const columns = [ { title: "人员姓名", @@ -42,14 +41,61 @@ export const Default = (props) => { }, }, { - title: "本周工作计划", - key: "work", - dataIndex: "work", + title: "周一", + key: "md", + dataIndex: "md", hideInSearch: true, render: (dom, record) => { - return
{record?.work?.map((item) => { - return
{item.time}{item.project }
- })}
+ return record.md + }, + }, + { + title: "周二", + key: "td", + dataIndex: "td", + hideInSearch: true, + render: (dom, record) => { + return record.td + }, + },{ + title: "周三", + key: "wd", + dataIndex: "wd", + hideInSearch: true, + render: (dom, record) => { + return record.wd + }, + },{ + title: "周四", + key: "thd ", + dataIndex: "thd ", + hideInSearch: true, + render: (dom, record) => { + return record.thd + }, + },{ + title: "周五", + key: "fd", + dataIndex: "fd", + hideInSearch: true, + render: (dom, record) => { + return record.fd + }, + },{ + title: "周六", + key: "sd", + dataIndex: "sd", + hideInSearch: true, + render: (dom, record) => { + return record.sd + }, + },{ + title: "周日", + key: "ssd", + dataIndex: "ssd", + hideInSearch: true, + render: (dom, record) => { + return record.ssd }, }, { @@ -71,7 +117,7 @@ export const Default = (props) => { { - delDataList(record.id); + delDataList(record); }} > @@ -103,19 +149,44 @@ export const Default = (props) => { ]; const handleCancel = () => { setVisible(false) + tableActionRef.current.reload(); } - const handOk = () => { - + const handOk = (values) => { + const query = [{ + name_people: values.name_people, + post_people: values.post_people, + md: values.md, + td: values.td, + wd: values.wd, + thd: values.thd, + fd: values.fd, + sd: values.sd, + ssd: values.ssd, + o_name_people:editData?.name_people, + }]; + dispatch(postInPeople(query)).then((res) => { + if (res.success) { + handleCancel(); + // tableActionRef.current.reload(); + } + }); } const importHandleCancel = () => { setImportVisible(false) + tableActionRef.current.reload(); } //删除资讯 - const delDataList = (ids, type) => { - dispatch(Action.delDataList(ids)).then((res) => { + const delDataList = (record) => { + const query = { + delete: record?.name_people, + delete_state: record?.post_people, + table_name: "test_people", + }; + dispatch(delCancel(query)).then((res) => { if (res.success) { // 刷新 - tableActionRef.current.reload(); + // tableActionRef.current.reload(); + handleCancel() } }); }; @@ -137,7 +208,6 @@ export const Default = (props) => { collapsed: false, }} request={async(params) => { - console.log(params) const res = await dispatch(postOutPeople()); setCounts(res.payload.data.projects); diff --git a/web/client/src/sections/wait/actions/article.js b/web/client/src/sections/wait/actions/article.js index cdada0d..ffe43b9 100644 --- a/web/client/src/sections/wait/actions/article.js +++ b/web/client/src/sections/wait/actions/article.js @@ -3,62 +3,38 @@ import { ApiTable } from "$utils"; import { Request } from "@peace/utils"; import { basicAction } from "@peace/utils"; -export function addArticle(articleObj) { +export function postWaitUrl(articleObj) { return (dispatch) => basicAction({ type: "post", dispatch: dispatch, data: articleObj, - actionType: "ADD_ARTICLE", - url: `${ApiTable.addArticle}`, - msg: { error: "新增文章失败" }, - reducer: { name: "articleInsertInfo" }, + actionType: "POST_WAITURL", + url: `${ApiTable.waitUrl}`, + msg: { error: "获取项目失败" }, }); } - -export function editArticle(articleObj) { +export function postInWait(articleObj) { return (dispatch) => basicAction({ - type: "put", + type: "post", dispatch: dispatch, data: articleObj, - actionType: "EDIT_ARTICLE", - url: `${ApiTable.addArticle}`, - msg: { error: "编辑文章失败" }, - reducer: { name: "articleInsertInfo" }, + actionType: "POST_INWAIT", + url: `${ApiTable.postInWait}`, + msg: { error: "添加项目失败" }, }); } -export function getDataList(query) { +export function delCancel(query) { return (dispatch) => basicAction({ - type: "get", + type: "post", dispatch: dispatch, - actionType: "GET_DATALIST", - url: ApiTable.getDataList, - query: query, - msg: { error: "获取文章信息失败" }, - reducer: { - name: "articlesfrom", - }, + data: query, + actionType: "DEL_CANCEL", + url: `${ApiTable.delCancel}`, + msg: { error: "删除项目信息失败" }, + // reducer: { name: "articleInsertInfo" }, }); } -export function delDataList(id) { - return (dispatch) => - basicAction({ - type: "del", - dispatch: dispatch, - actionType: "DEL_DATALIST11", - url: ApiTable.delDataList + `?id=${id}`, - query: { id: id }, - msg: { error: "删除文章信息失败" }, - }); -} -export const MODIFYARTICAL = { - REQUEST_SUCCESS: "MODIFY_ARTICAL_SUCCESS", -}; -export function setModifyData(data) { - return (dispatch) => { - dispatch({ type: MODIFYARTICAL.REQUEST_SUCCESS, payload: { data } }); - }; -} diff --git a/web/client/src/sections/wait/components/import_model.js b/web/client/src/sections/wait/components/import_model.js index 41098a5..51b1368 100644 --- a/web/client/src/sections/wait/components/import_model.js +++ b/web/client/src/sections/wait/components/import_model.js @@ -53,7 +53,7 @@ const ImportUser = props => { }) }}>下载模板 */} - +
下载模板后填写完整后上传
diff --git a/web/client/src/sections/wait/components/modeal.js b/web/client/src/sections/wait/components/modeal.js index 53e5c41..3782a04 100644 --- a/web/client/src/sections/wait/components/modeal.js +++ b/web/client/src/sections/wait/components/modeal.js @@ -3,19 +3,21 @@ import { Modal, Form, Input, Button,DatePicker,Select } from 'antd' import dayjs from 'dayjs'; function modeal(props) { const [form] = Form.useForm(); - const { visible, handleOk, handleCancel, editData } = props + const { visible, handleOk, handleCancel, editData ,setEditData,setState} = props console.log(editData) useEffect(() => { if (editData && visible) { form.setFieldsValue({ name_project: editData.name_project, - part_people: editData.part_people, - build_time: dayjs(editData?.build_time), - publish_time: dayjs(editData.publish_time), + from_project: editData.from_project, + contacts: editData.contacts, progress:editData.progress }) + setState(true) } }, [editData, visible]) + + return ( - - + - - - - +
diff --git a/web/client/src/sections/wait/containers/index.js b/web/client/src/sections/wait/containers/index.js index 647d8dc..d625bfa 100644 --- a/web/client/src/sections/wait/containers/index.js +++ b/web/client/src/sections/wait/containers/index.js @@ -3,25 +3,21 @@ import React, { useEffect, useState, useRef } from "react"; import { connect } from "react-redux"; import { Button, Popconfirm } from "antd"; import ProTable from "@ant-design/pro-table"; -import Action from "../actions/index"; +import { postWaitUrl, postInWait,delCancel } from "../actions/article"; import moment from "moment"; import { push } from "react-router-redux"; import { Scroller } from "$components"; -import ProjectModeal from '../components/modeal' -import ImportModeal from '../components/import_model' +import ProjectModeal from "../components/modeal"; +import ImportModeal from "../components/import_model"; export const Default = (props) => { const { dispatch } = props; - const [heading, setHeading] = useState(); //标题 - const [state, setState] = useState(); //状态 - const [day, setDay] = useState(); //发布时间 + const [state, setState] = useState(false); //状态 const [counts, setCounts] = useState(); //数据 const [visible, setVisible] = useState(false); //弹窗 const [editData, setEditData] = useState(); //数据 - const [importVisible, setImportVisible] = useState(false); //弹窗 - const tableActionRef = useRef(); - const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date(), publish_time: new Date(), progress: '研发中' }] + const columns = [ { title: "项目", @@ -38,7 +34,7 @@ export const Default = (props) => { dataIndex: "from_project", hideInSearch: true, render: (dom, record) => { - return record.part_people + return record.from_project; }, }, { @@ -47,14 +43,15 @@ export const Default = (props) => { dataIndex: "contacts", hideInSearch: true, render: (dom, record) => { - return moment(record.build_time).format('YYYY-MM-DD') + return record.contacts; }, }, { - title: '处理进度', - dataIndex: 'progress', - key: 'progress', - align: 'center' + title: "处理进度", + dataIndex: "progress", + key: "progress", + align: "center", + hideInSearch: true, }, { title: "操作", @@ -75,14 +72,13 @@ export const Default = (props) => { { - delDataList(record.id); + delDataList(record); }} >
- ) - + ); }, }, { @@ -96,37 +92,72 @@ export const Default = (props) => { type="primary" style={{ width: "200px" }} onClick={() => { - setImportVisible(true) + editor(); }} > - 项目信息导入 + 添加 ); }, }, ]; const handleCancel = () => { - setVisible(false) - } - const handOk = () => { + tableActionRef.current.reload(); + setVisible(false); + }; + const handOk = (values) => { + let query = null; + if (state) { + query = [ + { + name_project: values.name_project, + from_project: values.from_project, + contacts: values.contacts, + progress: values.progress, + o_name_project: editData?.name_project, + }, + ]; + } else { + query = [ + { + name_project: values.name_project, + from_project: values.from_project, + contacts: values.contacts, + progress: values.progress, + }, + ]; + } + + dispatch(postInWait(query)).then((res) => { + if (res.success) { + handleCancel(); + setEditData([]); + tableActionRef.current.reload(); + } + }); + }; - } - const importHandleCancel = () => { - setImportVisible(false) - } //删除资讯 - const delDataList = (ids, type) => { - dispatch(Action.delDataList(ids)).then((res) => { + const delDataList = (record) => { + const query = { + delete: record.name_project, + delete_state: record.progress, + table_name: "test_waiting", + }; + dispatch(delCancel(query)).then((res) => { if (res.success) { // 刷新 - tableActionRef.current.reload(); + // tableActionRef.current.reload(); + handleCancel() } }); }; //编辑 const editor = (record) => { - setVisible(true) - setEditData(record) + if (record) { + setEditData(record); + } + setVisible(true); }; return (
@@ -135,28 +166,14 @@ export const Default = (props) => { actionRef={tableActionRef} columns={columns} options={false} - dataSource={dataSore} + dataSource={counts || []} search={{ optionRender: false, collapsed: false, }} request={async (params) => { - let query = { - type: -1, - searchValue: heading, - status: state, - page: params.current, - limit: params.pageSize, - publishTime: - day && day.length && day[0].trim() != "" - ? JSON.stringify([ - moment(day[0]).startOf("day"), - moment(day[1]).endOf("day"), - ]) - : null, - }; - const res = await dispatch(Action.getDataList(query)); - setCounts(res.payload.data); + const res = await dispatch(postWaitUrl()); + setCounts(res.payload.data.projects); return { ...res, total: res.payload.data ? res.payload.data.total : 0, @@ -168,8 +185,15 @@ export const Default = (props) => { }} /> - - +
); }; @@ -182,11 +206,10 @@ const mapStateToProps = (state) => ({}); export default connect(mapStateToProps)(Default); - const data = [ - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: 'yongchu', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' }, - { name: '大王', age: '18', 任务1: 'v1', 计划1: 'time1' } -] \ No newline at end of file + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "yongchu", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, + { name: "大王", age: "18", 任务1: "v1", 计划1: "time1" }, +]; diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 0521bde..957e728 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -7,12 +7,12 @@ export const ApiTable = { peopleUrl: "outPeople", // 人员情况 waitUrl: "outWait", // 待研项目 postInProject:'inProject', // 增加项目 - postInPeople:'inPeople',//增加人员任务 - //支委会人员信息 - getCommittee: "partyOrganizations", //获取支委会人员 - postCommittee: "partyOrganization", //新增 - putCommittee: "partyOrganization/:id", //修改 - apiRoot: 'query/api/root', + postInPeople: 'inPeople',//增加人员任务 + postInWait: 'inWait',//增加人员任务 + + delCancel: 'deleteDB', //删除信息 + //下载项目模板 + getDownProject:'downProject' }; export const RouteTable = {