From 89f4e921c6404e144fa2a9b7a147e482781adadd Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Fri, 27 Sep 2024 17:49:18 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 7 +- public/assets/images/four.png | Bin 0 -> 3161 bytes public/assets/images/one.png | Bin 0 -> 1670 bytes public/assets/images/three.png | Bin 0 -> 2563 bytes public/assets/images/two.png | Bin 0 -> 1034 bytes src/views/fxzb/qxdw/gc/form.js | 4 +- src/views/fxzb/qxdw/gc/index.js | 2 +- src/views/fxzb/qxdw/zq/form.js | 6 +- src/views/fxzb/qxdw/zq/index.js | 2 +- src/views/gcaqjc/gcaqfx/jrx/toolbar.js | 10 +- src/views/gcaqjc/gcaqyj/yhyj/toolbar.js | 10 +- src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/czcx/toolbar.js | 10 +- src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/sljc/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/syjc/toolbar.js | 6 +- src/views/gcaqjc/sjtjcx/wyjc/toolbar.js | 6 +- src/views/gxsl/gstjfx/toolbar.js | 10 +- src/views/gxsl/zfjk/toolbar.js | 12 +- src/views/gxsl/zfjk/toolbar1.js | 10 +- src/views/gxsl/zfzl/toolbar.js | 12 +- src/views/gxsl/zfzl/toolbar1.js | 10 +- src/views/rcgl/aqgl/aqjcgl/toolbar.js | 12 +- src/views/rcgl/aqgl/aqjdtz/toolbar.js | 6 +- src/views/rcgl/aqgl/aqsgdj/toolbar.js | 12 +- src/views/rcgl/aqgl/aqyhpc/toolbar.js | 12 +- src/views/rcgl/aqgl/cxjgtz/toolbar.js | 6 +- src/views/rcgl/aqgl/fxgkqd/toolbar.js | 6 +- src/views/rcgl/btbb/rjswnbb/toolbar.js | 6 +- src/views/rcgl/btbb/rjynbb/toolbar.js | 6 +- src/views/rcgl/btbb/sdjyrbb/toolbar.js | 12 +- src/views/rcgl/btbb/sdswrbb/toolbar.js | 12 +- src/views/rcgl/byfz/bypc/toolbar.js | 12 +- src/views/rcgl/byfz/fzxc/toolbar.js | 6 +- src/views/rcgl/gcdsj/toolbar.js | 6 +- src/views/rcgl/jdkh/khzbgl/toolbar.js | 6 +- src/views/rcgl/stlljc/toolbar.js | 10 +- src/views/rcgl/szzb/toolbar.js | 10 +- src/views/rcgl/xcxj/xjxpz/toolbar.js | 6 +- src/views/spjk/aiWarn/toolbar.js | 10 +- src/views/sq/qzq/gcdsj/toolbar.js | 6 +- src/views/sq/qzq/qzqda/toolbar.js | 6 +- src/views/sz/flfg/toolbar.js | 4 +- src/views/sz/pxjhgl/RecordForm.js | 4 +- src/views/sz/szzf/ajdj/toolbar.js | 6 +- src/views/sz/zdgl/toolbar.js | 6 +- src/views/sz/zzjgck/index.js | 89 ++++++++- src/views/sz/zzjgck/index.less | 24 +++ src/views/sz/zzjgck/jgoption.js | 207 ++++++++------------- src/views/zbgl/zbrz/toolbar.js | 10 +- 52 files changed, 357 insertions(+), 308 deletions(-) create mode 100644 public/assets/images/four.png create mode 100644 public/assets/images/one.png create mode 100644 public/assets/images/three.png create mode 100644 public/assets/images/two.png diff --git a/package.json b/package.json index a7212e46d..a6b4baed4 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "gsap": "^3.11.5", "http-proxy-middleware": "^2.0.6", "js-md5": "^0.8.3", + "konva": "^8.3.14", "lodash": "^4.17.21", "moment": "^2.29.4", "ol": "^7.4.0", @@ -43,6 +44,7 @@ "react-audio-player": "^0.17.0", "react-cookies": "^0.1.1", "react-dom": "^18.2.0", + "react-konva": "^18.2.3", "react-pdf": "^7.3.3", "react-redux": "^8.0.2", "react-rnd": "^10.4.11", @@ -50,10 +52,7 @@ "react-router-dom": "^6.3.0", "react-scripts": "5.0.1", "redux": "^4.2.0", - "typescript": "^4.7.4", - "konva": "^8.3.14", - "react-konva": "^18.2.3" - + "typescript": "^4.7.4" }, "scripts": { "start": "craco start", diff --git a/public/assets/images/four.png b/public/assets/images/four.png new file mode 100644 index 0000000000000000000000000000000000000000..d114e6bdcba0f1a667d6eb627ce96370c91dc4d5 GIT binary patch literal 3161 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 literal 0 HcmV?d00001 diff --git a/public/assets/images/three.png b/public/assets/images/three.png new file mode 100644 index 0000000000000000000000000000000000000000..03637859489c99006c8f6b2ce4510c4701832739 GIT binary patch literal 2563 zcmV+e3jFnnP)gIH%;5Ts0nRStxd6;XcY=2inORy(3PgR7Ey2^hzb>#U5Q29Sa9jWMHkw& zts56M(4t^>5c)F~%DgQX|9RNRd;32PseEaA1cIL@FVZ!OU-0w{5 zIiA9Heb`Sf`De`WR2gG+oYAD(=4V!aCn9E%km^JOhFTo~Z^CNpM82!R&y_td=sUIn7Jg*u_X?dF0}NC!9I7rZMau0?%G`T)6>^E7I1sG2q=d10O$a z*coQ#EDSlZsjBnD$c50~_TQXPX=O|qd-1Aom$2S(Hb_)gbzLNSyY1!u&Q`4r^`0H9 z-e(fM|0M9;2W%QM0{GT*jz9h zyw7mc5#Vz_bEeafh#hXj$nZwCy62t1(G76>Ex@^x+v)e;Zn*81=rB#H1fMr9Ac_S4 zO8fhD;QHbA@1HleKVIIe{f^d>HAonH; zriEC;Rl>$Pe*mJpGe=G#QMqNJtMN|jRSg*145R`V!v_vU6IqJNLZhs)VaaNtQUlVJ zL$Zg~85+b~L3eT1xUYjKC_929jgbIm$(r+7O`c*Go)pwtouu=I2n6ZenSsIMyiWa1 zl8k!^?1Yb?>LGAt>(OuekZchLt|#CaXKHxfjUe$dkwhV_J*#onbZi2`)=%QHPc@*? z!Au03nbZtZ8{^E;qF|srg}Hh*3npqz)&7v_zB4ZRSmO;L6W7L%LapC`RPEut>({XX za4nd-bCgxo?^1^#Jl~JW;u(w$b)+X;BSU>!$r4p+=3u)oa3vl+vcyR$0VG_+W7UH# zI0$j!d}XyH@fBiHW0u3ms0LvP8@45OYGt1?QF$FzJ)F-H8&&9P_DgKjd0`5SQNkgE zspg@+vQV=3s*J6vIRtg^J|63$vg);j996omZnP-Gl425Ds7jIjR*6&n!lgzN#z>99 zCIZ4)%HU9N8LyySg;|K%lEO82@tArU+m8`!nK)+;hwQ06;i%JJ7Tj`giB?=s3ql=Y zxjIg8GuXGU!pYwxH!XLV?SNAuOaGNodZ`s)UYs z&r*Q2Q*Q?sox5OVi$BIYTDewL>Y+gi>L6*LhRs_3Y`W0Kt;;kl8E59yzzI}k@Wrar zQod?r)3{AwCv*teTN{@kW(lVL7$qA=*?ESxmNd0yVbOF`;&JYB=psZlVPe+6T9O6l zJ`It1?hs%`++Iu*)Ra}cjwCb!>btzSNmQEIvSFUikx$?M46T$? z!|IVOIDj=rsiYbjp!vGzT@Q!V_GV zwUdF|o4r_2$!Kspy8@(gk|NWInJhs!brXEi=NS`14azu@g?x;T(+ONv+U-!HCN?ca z&<}dp**Nuhg`|`)R%z+XQyp#SJPXg z)6k~Vae{Z%mE9L8V()X0pG~EBnVrfp!H|vhqZFw#RTG&Hw4;eo{mz{O1O9r}EK&UQJ#=dyWn`Y{BSIKxwTCYVSZD0A2 z;i30#KQ?*pCEy3Yi>&O?oKe&pKGD$QK$Ykl_Zc3(XX%&wcO5f)``63J>M%%N)^3`2 z)svVNHIxD(R{U#il!X(XoGCx^g-dBN-Ec65W)cB_1xXUY9G&e%EFu!0uX z4uC&g>&d;e2mI+3k<6pE>Y5wwaExUx__d3Ui07|7*KY`RuT?kDM`l z^2W^Rv*y6Kpc3!*z9r9LU_fr5S z)h4c}EMP)ye0^SPO2NbV*<*#y_G??`2)wma>jHo^jxU86E|I Z{{cCI5aWV7-c0}i002ovPDHLkV1iKb3Jw4O literal 0 HcmV?d00001 diff --git a/public/assets/images/two.png b/public/assets/images/two.png new file mode 100644 index 0000000000000000000000000000000000000000..d149368d4137e67cdba3eeee4ae8d52acb06db71 GIT binary patch literal 1034 zcmV+l1oiugP)G$|}}t#H>NvKeQT!G8^=2mFE}}S}3cp zJo<`eP={URsq!DmOrdI?8zY4R!bF&!8JD8oV#X9(aoYS6x`RM-y#$X0fqB|}~VS%Cw1^?4Ja#sKbK?}RMdTOCxDupHUN%TF74c%xgljPPBW6^FrO26|g~9foDxKEO_fnJVcR?g&#LGO>2TY`K)hHNUp)Y@s-EkCQjf4f_@*o9vLbTyt0H~z-PNx z1+yiz$5renGU#j#!snH-8%v|NJp_N92g!5}4gTsq8DX|u#@22MD{Fg@WuU7yh=INq zG&R;ElT-O~opdH&-GGpAm|ex2`3Me@S=4!D?8Ow^9O~iS|FOQ0pV0%vQ&~i};~2Yo z#&TFl?6%y+PE6tb&E-`jl^hNd8Jq~#@zv<}L7LxFY;3xO*>W+Z4VF~nlSHxdxCpkR zQV#hvrPmgIpNH?f7|e;T7NI;YV(d!4Zf7r^Yvq4-5oXK5cr4ycS)p3I8@+1y~IgQ&R?fgv7i}yRW4}&p(sIM)6J0l%s`FuB4 zs4C8Uo<#todkW!{Uuch$U?%_{jCTFi9A z{2xM$kCZct7}aa%m?6eBMTzQ^KO$!^4#%DwgE}hG;gY_T#j3wu(_+?T}W7Prt0YVR9E5zWMMgRZ+07*qoM6N<$ Ef`~lvBme*a literal 0 HcmV?d00001 diff --git a/src/views/fxzb/qxdw/gc/form.js b/src/views/fxzb/qxdw/gc/form.js index 91e544934..f41b3125e 100644 --- a/src/views/fxzb/qxdw/gc/form.js +++ b/src/views/fxzb/qxdw/gc/form.js @@ -361,12 +361,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { useEffect(() => { if (mode !== "save") { - let dataSo = [ + let dateSo = [ record.validStartDate? moment(record.validStartDate):'', record.validEndDate? moment(record.validEndDate): '' ] - form.setFieldsValue({...record,dateRangeSo:dataSo}) + form.setFieldsValue({...record,dateRangeSo:dateSo}) } diff --git a/src/views/fxzb/qxdw/gc/index.js b/src/views/fxzb/qxdw/gc/index.js index a946f9467..0b2852529 100644 --- a/src/views/fxzb/qxdw/gc/index.js +++ b/src/views/fxzb/qxdw/gc/index.js @@ -36,7 +36,7 @@ const Page = () => { { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true }, { title: '登记日期', key: 'registerDate', dataIndex: 'registerDate', width: 150, ellipsis: true }, { - title: '有效期限', key: 'dataSo', dataIndex: 'dataSo', width: 250, + title: '有效期限', key: 'dateSo', dataIndex: 'dateSo', width: 250, render: (value, row, index) => { return ( <> diff --git a/src/views/fxzb/qxdw/zq/form.js b/src/views/fxzb/qxdw/zq/form.js index 8627c3983..7c7c3cecb 100644 --- a/src/views/fxzb/qxdw/zq/form.js +++ b/src/views/fxzb/qxdw/zq/form.js @@ -128,14 +128,14 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { useEffect(() => { let serviceObj - let dataSo = [ + let dateSo = [ moment(record.validStartDate), moment(record.validEndDate) ] if (serviceObjs?.length > 0) { serviceObj = serviceObjs.map(item => item.name).join() } - form.setFieldsValue({...record,dataSo,serviceObjs:serviceObj}) + form.setFieldsValue({...record,dateSo,serviceObjs:serviceObj}) }, [record,serviceObjs]) return ( @@ -172,7 +172,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { { { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true }, { title: '登记日期', key: 'registerDate', dataIndex: 'registerDate', width: 150, ellipsis: true }, { - title: '有效期限', key: 'dataSo', dataIndex: 'dataSo', width: 250, + title: '有效期限', key: 'dateSo', dataIndex: 'dateSo', width: 250, render: (value, row, index) => { return ( <> diff --git a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js b/src/views/gcaqjc/gcaqfx/jrx/toolbar.js index 27c057031..c1265fa57 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/toolbar.js +++ b/src/views/gcaqjc/gcaqfx/jrx/toolbar.js @@ -10,25 +10,25 @@ const ToolBar = ({ setSearchVal, onSave,setSwiper,exportFile,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } // useEffect(() => { // let time = [moment().subtract(1,"months"),moment()] - // let dataSo = { + // let dateSo = { // start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), // end:moment(time[1]).format('YYYY-MM-DD 00:00:00'), // } // form.setFieldValue("tm",time) - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) // }, []) useEffect(() => { diff --git a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js b/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js index 9ce570623..b10825df6 100644 --- a/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js +++ b/src/views/gcaqjc/gcaqyj/yhyj/toolbar.js @@ -36,24 +36,24 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { let time = [moment().subtract(1,"weeks"),moment()] - let dataSo = { + let dateSo = { start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal({dateTimeRangeSo:dataSo}) + setSearchVal({dateTimeRangeSo:dateSo}) }, []) diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js b/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js index f6e1994de..3af8ea68d 100644 --- a/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js +++ b/src/views/gcaqjc/gcaqyj/yjgzpz/toolbar.js @@ -26,15 +26,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js b/src/views/gcaqjc/sjtjcx/czcx/toolbar.js index e7428b938..98add20b4 100644 --- a/src/views/gcaqjc/sjtjcx/czcx/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/czcx/toolbar.js @@ -26,25 +26,25 @@ const ToolBar = ({ setSearchVal, onSave, onChecked,role }) => { }, ] const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { let time = [moment().subtract(1,"months"),moment()] - let dataSo = { + let dateSo = { start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal({dateTimeRangeSo:dataSo}) + setSearchVal({dateTimeRangeSo:dateSo}) }, []) return ( <> diff --git a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js index f5dfb2b3d..ac122270c 100644 --- a/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/ndsltjb/toolbar.js @@ -12,12 +12,12 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile,role }) => { const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = moment(values.tm).format('YYYY') + dateSo = moment(values.tm).format('YYYY') } delete values.tm - setSearchVal({ ...values, year: dataSo }); + setSearchVal({ ...values, year: dateSo }); } diff --git a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js index 4a9b5bb08..4c98bcd4f 100644 --- a/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/ndsytjb/toolbar.js @@ -22,12 +22,12 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = moment(values.tm).format('YYYY') + dateSo = moment(values.tm).format('YYYY') } delete values.tm - setSearchVal({ ...values, year: dataSo }); + setSearchVal({ ...values, year: dateSo }); setDmName(dmList.find(item => item.value == values.profileCode).label) } diff --git a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js index b2e0b9540..431ffeb83 100644 --- a/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/ndwytjb/toolbar.js @@ -12,12 +12,12 @@ const ToolBar = ({ setSearchVal, setDmName, exportFile, role }) => { const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = moment(values.tm).format('YYYY') + dateSo = moment(values.tm).format('YYYY') } delete values.tm - setSearchVal({ ...values, year: dataSo }); + setSearchVal({ ...values, year: dateSo }); } diff --git a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js index 8d99e6ea3..9c1e86ec0 100644 --- a/src/views/gcaqjc/sjtjcx/sljc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/sljc/toolbar.js @@ -56,15 +56,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } diff --git a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js index 71e71249d..f132bd9c1 100644 --- a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js @@ -76,15 +76,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { diff --git a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js index 9386de1f8..1efbec34c 100644 --- a/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/wyjc/toolbar.js @@ -68,15 +68,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { diff --git a/src/views/gxsl/gstjfx/toolbar.js b/src/views/gxsl/gstjfx/toolbar.js index fa6422fd9..8ffa50e19 100644 --- a/src/views/gxsl/gstjfx/toolbar.js +++ b/src/views/gxsl/gstjfx/toolbar.js @@ -55,15 +55,15 @@ const ToolBar = ({ setSearchVal, setMode, exportFile,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { startTime: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), endTime: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, ...dataSo}); + setSearchVal({...values, ...dateSo}); } useEffect(() => { @@ -72,12 +72,12 @@ const ToolBar = ({ setSearchVal, setMode, exportFile,role }) => { useEffect(() => { let time = [moment().subtract(7,"days"),moment()] - let dataSo = { + let dateSo = { startTime:moment(time[0]).format('YYYY-MM-DD 00:00:00'), endTime:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal(dataSo) + setSearchVal(dateSo) }, []) return ( diff --git a/src/views/gxsl/zfjk/toolbar.js b/src/views/gxsl/zfjk/toolbar.js index b3ddc02d6..a27ae15c0 100644 --- a/src/views/gxsl/zfjk/toolbar.js +++ b/src/views/gxsl/zfjk/toolbar.js @@ -7,32 +7,32 @@ const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, searchVal,exportFile }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm1) { - dataSo = { + dateSo = { start: moment(values.tm1[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm1[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm1 - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } // useEffect(() => { // let time = [moment().subtract(1,"months"),moment()] - // let dataSo = { + // let dateSo = { // start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), // end:moment(time[1]).format('YYYY-MM-DD 00:00:00'), // } // form.setFieldValue("tm",time) - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) // }, []) useEffect(() => { if (searchVal) { let time = [moment(searchVal.dateTimeRangeSo?.start),moment(searchVal.dateTimeRangeSo?.end)] form.setFieldValue("tm1",time) } - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) }, [searchVal]) return ( <> diff --git a/src/views/gxsl/zfjk/toolbar1.js b/src/views/gxsl/zfjk/toolbar1.js index 11aaa30c1..71ffe4c86 100644 --- a/src/views/gxsl/zfjk/toolbar1.js +++ b/src/views/gxsl/zfjk/toolbar1.js @@ -6,21 +6,21 @@ const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { // let time = [moment().subtract(1,"months"),moment()] - // let dataSo = { + // let dateSo = { // start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), // end:moment(time[1]).format('YYYY-MM-DD 00:00:00'), // } @@ -28,7 +28,7 @@ const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => { let time = [moment(searchValLog.dateTimeRangeSo?.start),moment(searchValLog.dateTimeRangeSo?.end)] form.setFieldValue("tm",time) } - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) }, [searchValLog]) return ( <> diff --git a/src/views/gxsl/zfzl/toolbar.js b/src/views/gxsl/zfzl/toolbar.js index b3ddc02d6..a27ae15c0 100644 --- a/src/views/gxsl/zfzl/toolbar.js +++ b/src/views/gxsl/zfzl/toolbar.js @@ -7,32 +7,32 @@ const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, searchVal,exportFile }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm1) { - dataSo = { + dateSo = { start: moment(values.tm1[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm1[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm1 - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } // useEffect(() => { // let time = [moment().subtract(1,"months"),moment()] - // let dataSo = { + // let dateSo = { // start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), // end:moment(time[1]).format('YYYY-MM-DD 00:00:00'), // } // form.setFieldValue("tm",time) - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) // }, []) useEffect(() => { if (searchVal) { let time = [moment(searchVal.dateTimeRangeSo?.start),moment(searchVal.dateTimeRangeSo?.end)] form.setFieldValue("tm1",time) } - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) }, [searchVal]) return ( <> diff --git a/src/views/gxsl/zfzl/toolbar1.js b/src/views/gxsl/zfzl/toolbar1.js index 11aaa30c1..71ffe4c86 100644 --- a/src/views/gxsl/zfzl/toolbar1.js +++ b/src/views/gxsl/zfzl/toolbar1.js @@ -6,21 +6,21 @@ const { RangePicker } = DatePicker; const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { // let time = [moment().subtract(1,"months"),moment()] - // let dataSo = { + // let dateSo = { // start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), // end:moment(time[1]).format('YYYY-MM-DD 00:00:00'), // } @@ -28,7 +28,7 @@ const ToolBar = ({ setSearchVal, onSave,exportFile,type,searchValLog }) => { let time = [moment(searchValLog.dateTimeRangeSo?.start),moment(searchValLog.dateTimeRangeSo?.end)] form.setFieldValue("tm",time) } - // setSearchVal({dateTimeRangeSo:dataSo}) + // setSearchVal({dateTimeRangeSo:dateSo}) }, [searchValLog]) return ( <> diff --git a/src/views/rcgl/aqgl/aqjcgl/toolbar.js b/src/views/rcgl/aqgl/aqjcgl/toolbar.js index dc60c9dae..5aa08797b 100644 --- a/src/views/rcgl/aqgl/aqjcgl/toolbar.js +++ b/src/views/rcgl/aqgl/aqjcgl/toolbar.js @@ -9,24 +9,24 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } useEffect(() => { - let dataSo = { + let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) - setSearchVal({ dataSo }) + form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) + setSearchVal({ dateSo }) }, []) return ( diff --git a/src/views/rcgl/aqgl/aqjdtz/toolbar.js b/src/views/rcgl/aqgl/aqjdtz/toolbar.js index cc0fe6a6e..fcd1e5256 100644 --- a/src/views/rcgl/aqgl/aqjdtz/toolbar.js +++ b/src/views/rcgl/aqgl/aqjdtz/toolbar.js @@ -8,15 +8,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/aqgl/aqsgdj/toolbar.js b/src/views/rcgl/aqgl/aqsgdj/toolbar.js index d268b5810..010efeb92 100644 --- a/src/views/rcgl/aqgl/aqsgdj/toolbar.js +++ b/src/views/rcgl/aqgl/aqsgdj/toolbar.js @@ -9,24 +9,24 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } useEffect(() => { - let dataSo = { + let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) - setSearchVal({ dataSo }) + form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) + setSearchVal({ dateSo }) }, []) return ( diff --git a/src/views/rcgl/aqgl/aqyhpc/toolbar.js b/src/views/rcgl/aqgl/aqyhpc/toolbar.js index 0cadf8be0..afa786fac 100644 --- a/src/views/rcgl/aqgl/aqyhpc/toolbar.js +++ b/src/views/rcgl/aqgl/aqyhpc/toolbar.js @@ -9,24 +9,24 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } useEffect(() => { - let dataSo = { + let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) - setSearchVal({ dataSo }) + form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) + setSearchVal({ dateSo }) }, []) return ( diff --git a/src/views/rcgl/aqgl/cxjgtz/toolbar.js b/src/views/rcgl/aqgl/cxjgtz/toolbar.js index cc0fe6a6e..fcd1e5256 100644 --- a/src/views/rcgl/aqgl/cxjgtz/toolbar.js +++ b/src/views/rcgl/aqgl/cxjgtz/toolbar.js @@ -8,15 +8,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/aqgl/fxgkqd/toolbar.js b/src/views/rcgl/aqgl/fxgkqd/toolbar.js index 217b383b3..75f21a949 100644 --- a/src/views/rcgl/aqgl/fxgkqd/toolbar.js +++ b/src/views/rcgl/aqgl/fxgkqd/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/btbb/rjswnbb/toolbar.js b/src/views/rcgl/btbb/rjswnbb/toolbar.js index 19d291e46..33080490b 100644 --- a/src/views/rcgl/btbb/rjswnbb/toolbar.js +++ b/src/views/rcgl/btbb/rjswnbb/toolbar.js @@ -8,12 +8,12 @@ const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.year) { - dataSo = moment(values.year).format('YYYY') + dateSo = moment(values.year).format('YYYY') } delete values.year - setSearchVal({...values, year:Number(dataSo)}); + setSearchVal({...values, year:Number(dateSo)}); } useEffect(() => { diff --git a/src/views/rcgl/btbb/rjynbb/toolbar.js b/src/views/rcgl/btbb/rjynbb/toolbar.js index 19d291e46..33080490b 100644 --- a/src/views/rcgl/btbb/rjynbb/toolbar.js +++ b/src/views/rcgl/btbb/rjynbb/toolbar.js @@ -8,12 +8,12 @@ const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.year) { - dataSo = moment(values.year).format('YYYY') + dateSo = moment(values.year).format('YYYY') } delete values.year - setSearchVal({...values, year:Number(dataSo)}); + setSearchVal({...values, year:Number(dateSo)}); } useEffect(() => { diff --git a/src/views/rcgl/btbb/sdjyrbb/toolbar.js b/src/views/rcgl/btbb/sdjyrbb/toolbar.js index 6ba297651..68003eabd 100644 --- a/src/views/rcgl/btbb/sdjyrbb/toolbar.js +++ b/src/views/rcgl/btbb/sdjyrbb/toolbar.js @@ -8,24 +8,24 @@ const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, ...dataSo}); + setSearchVal({...values, ...dateSo}); } useEffect(() => { - let dataSo = { + let dateSo = { start: moment().subtract(1,"weeks").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) - setSearchVal(dataSo) + form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) + setSearchVal(dateSo) }, []) return ( diff --git a/src/views/rcgl/btbb/sdswrbb/toolbar.js b/src/views/rcgl/btbb/sdswrbb/toolbar.js index 6ba297651..68003eabd 100644 --- a/src/views/rcgl/btbb/sdswrbb/toolbar.js +++ b/src/views/rcgl/btbb/sdswrbb/toolbar.js @@ -8,24 +8,24 @@ const ToolBar = ({ setSearchVal, onSave, exportFile, role }) => { const exportBtn = role?.rule?.find(item => item.menuName == "导出")|| true; const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, ...dataSo}); + setSearchVal({...values, ...dateSo}); } useEffect(() => { - let dataSo = { + let dateSo = { start: moment().subtract(1,"weeks").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) - setSearchVal(dataSo) + form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) + setSearchVal(dateSo) }, []) return ( diff --git a/src/views/rcgl/byfz/bypc/toolbar.js b/src/views/rcgl/byfz/bypc/toolbar.js index 2e10c2000..320c1e47f 100644 --- a/src/views/rcgl/byfz/bypc/toolbar.js +++ b/src/views/rcgl/byfz/bypc/toolbar.js @@ -10,21 +10,21 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.year) { - dataSo = moment(values.year).format('YYYY') + dateSo = moment(values.year).format('YYYY') } delete values.year - setSearchVal({...values, year:Number(dataSo)}); + setSearchVal({...values, year:Number(dateSo)}); } // useEffect(() => { -// let dataSo = { +// let dateSo = { // start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), // end: moment().format('YYYY-MM-DD 00:00:00') // } -// form.setFieldValue("tm", [moment(dataSo.start), moment(dataSo.end)]) -// setSearchVal({ dataSo }) +// form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) +// setSearchVal({ dateSo }) // }, []) return ( diff --git a/src/views/rcgl/byfz/fzxc/toolbar.js b/src/views/rcgl/byfz/fzxc/toolbar.js index 46076442c..e68cf37fe 100644 --- a/src/views/rcgl/byfz/fzxc/toolbar.js +++ b/src/views/rcgl/byfz/fzxc/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/gcdsj/toolbar.js b/src/views/rcgl/gcdsj/toolbar.js index 8cead5b04..9b389df61 100644 --- a/src/views/rcgl/gcdsj/toolbar.js +++ b/src/views/rcgl/gcdsj/toolbar.js @@ -9,15 +9,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/jdkh/khzbgl/toolbar.js b/src/views/rcgl/jdkh/khzbgl/toolbar.js index 65ed72e43..8d487ff76 100644 --- a/src/views/rcgl/jdkh/khzbgl/toolbar.js +++ b/src/views/rcgl/jdkh/khzbgl/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/rcgl/stlljc/toolbar.js b/src/views/rcgl/stlljc/toolbar.js index b72a4cf7c..650372c7f 100644 --- a/src/views/rcgl/stlljc/toolbar.js +++ b/src/views/rcgl/stlljc/toolbar.js @@ -54,26 +54,26 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { startTime: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), endTime: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...dataSo}); + setSearchVal({...dateSo}); } useEffect(() => { let time = [moment().subtract(1,"months"),moment()] - let dataSo = { + let dateSo = { startTime:moment(time[0]).format('YYYY-MM-DD 00:00:00'), endTime:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal({...dataSo}) + setSearchVal({...dateSo}) }, []) diff --git a/src/views/rcgl/szzb/toolbar.js b/src/views/rcgl/szzb/toolbar.js index f67268f40..e55c252b4 100644 --- a/src/views/rcgl/szzb/toolbar.js +++ b/src/views/rcgl/szzb/toolbar.js @@ -70,26 +70,26 @@ const ToolBar = ({ setSearchVal, onChecked, exportFile, role }) => { } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, startTime:dataSo?.start,endTime:dataSo?.end}); + setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end}); } useEffect(() => { let time = [moment().subtract(1,"years"),moment()] - let dataSo = { + let dateSo = { start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal({startTime:dataSo.start, endTime:dataSo.end}) + setSearchVal({startTime:dateSo.start, endTime:dateSo.end}) }, []) return ( <> diff --git a/src/views/rcgl/xcxj/xjxpz/toolbar.js b/src/views/rcgl/xcxj/xjxpz/toolbar.js index 65ed72e43..8d487ff76 100644 --- a/src/views/rcgl/xcxj/xjxpz/toolbar.js +++ b/src/views/rcgl/xcxj/xjxpz/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/spjk/aiWarn/toolbar.js b/src/views/spjk/aiWarn/toolbar.js index 84dc0187a..0708ae2b4 100644 --- a/src/views/spjk/aiWarn/toolbar.js +++ b/src/views/spjk/aiWarn/toolbar.js @@ -38,26 +38,26 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { } } const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59') } } delete values.tm - setSearchVal({...values, dateTimeRangeSo:dataSo}); + setSearchVal({...values, dateTimeRangeSo:dateSo}); } useEffect(() => { getStationCode() let time = [moment().subtract(1,"weeks"),moment()] - let dataSo = { + let dateSo = { start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal({dateTimeRangeSo:dataSo}) + setSearchVal({dateTimeRangeSo:dateSo}) }, []) return ( <> diff --git a/src/views/sq/qzq/gcdsj/toolbar.js b/src/views/sq/qzq/gcdsj/toolbar.js index e8f1fd24d..174cedb82 100644 --- a/src/views/sq/qzq/gcdsj/toolbar.js +++ b/src/views/sq/qzq/gcdsj/toolbar.js @@ -9,15 +9,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, dataSo}); + setSearchVal({...values, dateSo}); } diff --git a/src/views/sq/qzq/qzqda/toolbar.js b/src/views/sq/qzq/qzqda/toolbar.js index 36bb68b62..f9a978838 100644 --- a/src/views/sq/qzq/qzqda/toolbar.js +++ b/src/views/sq/qzq/qzqda/toolbar.js @@ -9,15 +9,15 @@ const ToolBar = ({ setSearchVal, onExport, storeData, role }) => { const [form] = Form.useForm(); const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({ ...values, dataSo }); + setSearchVal({ ...values, dateSo }); } diff --git a/src/views/sz/flfg/toolbar.js b/src/views/sz/flfg/toolbar.js index c533bac57..c0c19b35c 100644 --- a/src/views/sz/flfg/toolbar.js +++ b/src/views/sz/flfg/toolbar.js @@ -10,9 +10,9 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { const [form] = Form.useForm(); const [showGj , setShowGj] =useState(false) const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } diff --git a/src/views/sz/pxjhgl/RecordForm.js b/src/views/sz/pxjhgl/RecordForm.js index 24dc18c13..487982102 100644 --- a/src/views/sz/pxjhgl/RecordForm.js +++ b/src/views/sz/pxjhgl/RecordForm.js @@ -121,12 +121,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { // useEffect(() => { // if (mode !== "save") { -// let dataSo = [ +// let dateSo = [ // record.validStartDate? moment(record.validStartDate):'', // record.validEndDate? moment(record.validEndDate): '' // ] -// form.setFieldsValue({...record,dateRangeSo:dataSo}) +// form.setFieldsValue({...record,dateRangeSo:dateSo}) // } diff --git a/src/views/sz/szzf/ajdj/toolbar.js b/src/views/sz/szzf/ajdj/toolbar.js index ddfb995f5..429e86554 100644 --- a/src/views/sz/szzf/ajdj/toolbar.js +++ b/src/views/sz/szzf/ajdj/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const [showGj, setShowGj] = useState(false) const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({ ...values, dataSo }); + setSearchVal({ ...values, dateSo }); } const opntios = [ diff --git a/src/views/sz/zdgl/toolbar.js b/src/views/sz/zdgl/toolbar.js index 71e19f4be..a50c53165 100644 --- a/src/views/sz/zdgl/toolbar.js +++ b/src/views/sz/zdgl/toolbar.js @@ -10,15 +10,15 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const [showGj, setShowGj] = useState(false) const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({ ...values, dataSo }); + setSearchVal({ ...values, dateSo }); } const opntios = [ diff --git a/src/views/sz/zzjgck/index.js b/src/views/sz/zzjgck/index.js index 9a9e274df..f0a478d00 100644 --- a/src/views/sz/zzjgck/index.js +++ b/src/views/sz/zzjgck/index.js @@ -1,12 +1,95 @@ import React, { useState, useMemo, useEffect } from 'react' import ReactEcharts from 'echarts-for-react'; import jgOption from './jgoption' +import { httpget2, httppost2,xyt_httpget2 } from '../../../utils/request'; +import apiurl from '../../../service/apiurl'; import "./index.less" export default function Zzjgck() { - const jgOptions = useMemo(() => { - return jgOption(); - }, []) + + + const [deptList, setDeptList] = useState([]) + const [deptUserList, setDeptUserList] = useState([]) + + // 获取部门数据 + const getDeptList = async() => { + try { + const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.deptlist); + if (result.code == 200) { + setDeptList(result.data); + getDeptUser() + } + + } catch (error) { + console.log(error); + } + } + + // 获取部门人员数据 + const getDeptUser = async() => { + try { + const result = await xyt_httpget2(apiurl.rcgl.zbgl.zbb.userList, {pageNum:1,pageSize:9999}); + if (result.code == 200) { + setDeptUserList(result.rows) + } + } catch (error) { + console.log(error); + } + } + + const buildTree = (data, parentId) => { + let tree = []; + data.forEach((node) => { + node.title = node.deptName; + node.key = node.deptId; + + if (node.parentId === parentId) { + let children = buildTree(data, node.deptId); + if (children.length) { + node.children = children; + } + tree.push(node); + } + }); + return tree; +} + const handleTreeList = (dept, user) => { + const deptArr = dept.map(item => { + return { + ...item, + value: item.deptId, + title: item.deptName, + // disabled: item.userId ? false : true, + children: user.filter(u => u.deptId == item.deptId).map(u => ({ + ...u, + value: u.userId, + title: u.nickName, + })) + } + }) + const treelist = buildTree(deptArr, 0) + return treelist + } + const treeList = useMemo(() => { + if (deptUserList?.length > 0 && deptList?.length > 0) { + return handleTreeList(deptList,deptUserList) + } else { + return [] + } + }, [deptUserList, deptList]) + + const jgOptions = useMemo(() => { + if (treeList.length > 0) { + return jgOption(treeList); + } else { + return {} + } + }, [treeList]) + + useEffect(() => { + getDeptList() + }, []) + return (
diff --git a/src/views/sz/zzjgck/index.less b/src/views/sz/zzjgck/index.less index e69de29bb..234c82eb9 100644 --- a/src/views/sz/zzjgck/index.less +++ b/src/views/sz/zzjgck/index.less @@ -0,0 +1,24 @@ +.org-parent{ + font-size: 20px; + color: '#000'; + padding: 20px; + background: url(../../../../public/assets/images/one.png) 0 0 no-repeat; +} +.org-parent1{ + font-size: 18px; + color: '#000'; + padding: 10px; + background: url(../../../../public/assets/images/two.png) 0 0 no-repeat; +} +.org-parent2{ + font-size: 18px; + color: '#000'; + padding: 10px; + background: url(../../../../public/assets/images/three.png) 0 0 no-repeat; +} +.org-parent3{ + font-size: 18px; + color: '#000'; + padding: 10px; + background: url(../../../../public/assets/images/four.png) 0 0 no-repeat; +} \ No newline at end of file diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js index 7e4bd30b6..e4b93d36b 100644 --- a/src/views/sz/zzjgck/jgoption.js +++ b/src/views/sz/zzjgck/jgoption.js @@ -1,93 +1,20 @@ -const getBackground = () => { + +export default function jgOption(data1) { + console.log("123",data1); + const one = `${process.env.PUBLIC_URL}/assets/images/one.png`; + const two = `${process.env.PUBLIC_URL}/assets/images/two.png`; + const three = `${process.env.PUBLIC_URL}/assets/images/three.png`; + const four = `${process.env.PUBLIC_URL}/assets/images/four.png`; return { - type: 'linear', - x: 0, - y: 0, - x2: 0, - y2: 1, - colorStops: [{ - offset: 0, color: '#ffffff' // 0% 处的颜色 - }, { - offset: 0.5, color: 'blue' // 100% 处的颜色 - }, { - offset: 1, color: '#ffffff' // 100% 处的颜色 - }], - global: false // 缺省为 false - } -} -const data = { - name: '销售部', - children: [{ - name: '销售一部', - children: [{ - name: '任务名称1', - itemStyle: { color: "#ff9800" }, - }, - { - name: '任务名称2', - itemStyle: { color: "#4d8dd9" }, - }, - { - name: '任务名称3', - itemStyle: { color: "#22b07b" }, - }, - { - name: '任务名称4' - }, - { - name: '任务名称5' - }, - { - name: '任务名称6' - }, - { - name: '任务名称7' - }, - { - name: '任务名称8' - } - ] - }, - { - name: '销售二部', - }, - { - name: '销售三部', - children: [{ - name: '任务3-1' - }, - { - name: '任务3-2' - } - ] - }, - { - name: '销售四部', - children: [{ - name: '任务4-1' - }, - { - name: '任务4-2' - } - ] - } - ] -} -export default function jgOption() { - return { - tooltip: { - trigger: 'item', - triggerOn: 'mousemove' - }, series: [{ type: 'tree', id: 0, name: 'tree1', - data: [data], + data: data1, top: '10%', - left: '10%', + left: '0%', bottom: '20%', - right: '10%', + right: '25%', avoidLabelOverlap: true,//防止标签重叠 roam: true, //移动+缩放 'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。 scaleLimit:{ //缩放比例 @@ -101,85 +28,101 @@ export default function jgOption() { symbol: 'circle', //图形形状 rect方形 roundRect圆角 emptyCircle圆形 circle实心圆 symbolSize: 14, //状态大小 edgeShape: 'polyline', //线条类型 curve曲线 - initialTreeDepth: 1, //初始展开的层级 + initialTreeDepth: 3, //初始展开的层级 expandAndCollapse: true,//子树折叠和展开的交互，默认打开 lineStyle: {//结构线条样式 - width: 0.7, + width: 1, color: '#1E9FFF', - type: 'broken' + type: 'solid' }, label: { // 每个节点对应的文本标签样式 show: true, // 是否显示标签 + // rotate:90, distance: 8, // 文本距离图形元素的距离 position: ['50%', '50%'], // 标签位置 verticalAlign: 'middle', // 文字垂直对齐方式，默认自动，top，middle，bottom align: 'center', // 文字水平对齐方式，默认自动，left，right，center fontSize: 16, // 字体大小 - color: '#333', // 字体颜色 - // color: 'red', // 字体颜色 - backgroundColor: '#F8F9FA', // 文字块的背景颜色 - borderColor: '#CED4DA', // 文字块边框颜色 - borderWidth: 1, // 文字块边框宽度 - borderType: 'solid', // 文字块边框描边类型 solid dashed dotted - borderRadius: 2, // 文字块的圆角 - padding: [6, 6], // 文字块内边距 - shadowColor: 'rgba(0,121,221,0.3)', // 文字块的背景阴影颜色 - shadowBlur: 6, // 文字块的背景阴影长度 + color: '#000', // 字体颜色 formatter: (params) => { let newName = '' - let len = params.data.name.length - let strLen = params.data.relationType === 0 ? 100 : 1 //一行显示几个字 + let len = params.data.title.length + let strLen = (params.data.parentId === 0 || params.data.parentId === 100 ) ? 100 : 1 //一行显示几个字 let rowNum = Math.ceil(len / strLen) if (len > strLen) { + for (let p = 0; p < rowNum; p++) { let tempStr = '' let start = p * strLen let end = start + strLen if (p == rowNum - 1) { - tempStr = params.data.name.substring(start, len) + tempStr = params.data.title.substring(start, len) } else { - tempStr = params.data.name.substring(start, end) + '\n' + tempStr = params.data.title.substring(start, end) + '\n' } newName += tempStr } } else { - newName = params.data.name + newName = params.data.title } let n = newName if (n.length > 16) { n = n.slice(0, 16) + '...' } - let str = `{name|${n}}` - let isMain = params.data.relationType === 0 - str = isMain ? `{name|${n}} {current|本企业} {main|总部}` : str - return str + let parentId = params.data.parentId + let userId = params.data.userId; + let str = parentId === 0 ? `{parent|${n}}` : + parentId === 100 ? `{parent1|${n}}` : userId != undefined ? `{parent3|${n}}` : `{parent2|${n}}` + // let str = parentId === 0 ? `
${n}
` : + // parentId === 100 ? `
${n}
` : userId != undefined ? `
${n}
` : `
${n}
` + return str; }, + rich: { - name: { - fontSize: 14 + parent: { + color: '#000', + padding: [20, 20], + backgroundColor: { + image:one + }, + + fontSize: 20 }, - current: { - fontSize: 12, - padding: 0, - color: '#07CA42', - fontWeight: 600, - backgroundColor: '#E5F7EA', - borderRadius: 2 + parent1: { + color: '#000', + padding: [10, 10], + backgroundColor: { + image:two + }, + fontSize: 18 + }, + parent2: { + fontSize: 18, + color: '#000', + align: 'center', + padding: [10, 10], + backgroundColor: { + image: three, + repeat: "no-repeat", + }, + }, + parent3: { + color: '#000', + padding: [10, 10], + backgroundColor: { + image: four, + repeat: "no-repeat", + }, + fontSize: 18 }, - main: { - color: '#0780ED', - fontSize: 12, - padding: 0, - fontWeight: 600, - backgroundColor: '#E6F2FD', - borderRadius: 2 - } } }, + + leaves: { //叶子节点文本样式 label: { - //backgroundColor: '#81c5f7', + // backgroundColor: '#81c5f7', backgroundColor: '#fff', color:'#333', position: 'bottom', @@ -187,15 +130,15 @@ export default function jgOption() { verticalAlign: 'middle', align: 'center', //文本框内文字超过6个字折行 - /* formatter: function(val) { - let strs = val.name.split(''); //字符串数组 - let str = '' - for(let i = 0, s; s = strs[i++];) { //遍历字符串数组 - str += s; - if(!(i % 6)) str += '\n'; //按需要求余，目前是一个字换一行 - } - return str - }, */ + // formatter: function(val) { + // let strs = val.name.split(''); //字符串数组 + // let str = '' + // for(let i = 0, s; s = strs[i++];) { //遍历字符串数组 + // str += s; + // if(!(i % 6)) str += '\n'; //按需要求余，目前是一个字换一行 + // } + // return str + // }, //或者 overflow:'break',//break为文字折行， truncate为文字超出部分省略号显示 lineOverflow:'truncate',//文字超出高度后 直接截取 diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js index f86e904ca..fdbd94c96 100644 --- a/src/views/zbgl/zbrz/toolbar.js +++ b/src/views/zbgl/zbrz/toolbar.js @@ -12,26 +12,26 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => { const onFinish = (values) => { - let dataSo; + let dateSo; if (values.tm) { - dataSo = { + dateSo = { start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'), end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss') } } delete values.tm - setSearchVal({...values, startTime:dataSo?.start,endTime:dataSo?.end}); + setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end}); } useEffect(() => { let time = [moment().subtract(7,"days"),moment()] - let dataSo = { + let dateSo = { start:moment(time[0]).format('YYYY-MM-DD 00:00:00'), end:moment(time[1]).format('YYYY-MM-DD 23:59:59'), } form.setFieldValue("tm",time) - setSearchVal(dataSo) + setSearchVal(dateSo) }, []) return ( <>