From a66482fecadede0da8a8be0b23be8be65e23d7f4 Mon Sep 17 00:00:00 2001 From: wenlele Date: Wed, 6 Dec 2023 08:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E7=BD=91web?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-network/client/src/app.js | 5 +- .../src/layout/containers/layout/index.js | 10 +- .../src/sections/auth/containers/login.js | 2 +- .../sections/fillion/actions/allDepUsers.js | 14 - .../sections/fillion/actions/appointTask.js | 24 - .../src/sections/fillion/actions/assess.js | 35 - .../src/sections/fillion/actions/compile.js | 37 - .../src/sections/fillion/actions/config.js | 59 - .../src/sections/fillion/actions/extract.js | 42 - .../src/sections/fillion/actions/file.js | 89 - .../src/sections/fillion/actions/index.js | 18 - .../src/sections/fillion/actions/infor.js | 436 -- .../src/sections/fillion/actions/luzheng.js | 51 - .../src/sections/fillion/actions/patrol.js | 73 - .../src/sections/fillion/actions/task.js | 35 - .../fillion/components/assessModal.js | 112 - .../fillion/components/bridgeTable.js | 2019 --------- .../fillion/components/buildingTable.js | 379 -- .../sections/fillion/components/datajuji.js | 180 - .../fillion/components/editGuanlang.js | 211 - .../fillion/components/enforceTable.js | 1639 ------- .../components/feedback/nominateModal.js | 169 - .../components/feedback/nominateModalcopy.js | 136 - .../fillion/components/file/functionMenu.js | 94 - .../fillion/components/file/menu.less | 43 - .../fillion/components/file/roadModal.js | 73 - .../fillion/components/file/uploadModal.js | 46 - .../sections/fillion/components/fileTable.js | 466 -- .../sections/fillion/components/gis/bounds.js | 188 - .../fillion/components/gis/mock_data.js | 59 - .../fillion/components/gis/patrolGis.js | 163 - .../fillion/components/highways/guanli.js | 113 - .../components/highways/highwaysdata.js | 112 - .../fillion/components/highwaysTable.js | 421 -- .../fillion/components/infor/details.js | 383 -- .../fillion/components/infor/videoUpload.js | 227 - .../sections/fillion/components/inforTable.js | 551 --- .../fillion/components/luzhengmodel.js | 139 - .../fillion/components/maintenanceTable.js | 799 ---- .../fillion/components/maintenanceTable.less | 19 - .../fillion/components/operationalTable.js | 2179 --------- .../fillion/components/patrolTable.js | 1292 ------ .../fillion/components/project/project.js | 235 - .../fillion/components/promotionalTable.js | 177 - .../sections/fillion/components/protable.less | 31 - .../fillion/components/publicTable.js | 1365 ------ .../fillion/components/task/addTaskModal.js | 152 - .../fillion/components/transportationTable.js | 4033 ----------------- .../sections/fillion/components/uploads.js | 327 -- .../sections/fillion/components/videoTable.js | 215 - .../src/sections/fillion/containers/assess.js | 169 - .../src/sections/fillion/containers/bridge.js | 38 - .../sections/fillion/containers/building.js | 38 - .../sections/fillion/containers/enforce.js | 42 - .../src/sections/fillion/containers/file.js | 40 - .../sections/fillion/containers/highways.js | 33 - .../src/sections/fillion/containers/index.js | 26 - .../src/sections/fillion/containers/infor.js | 46 - .../fillion/containers/jiekouguanli.js | 9 - .../sections/fillion/containers/luzheng.js | 211 - .../fillion/containers/maintenance.js | 41 - .../containers/maintenanceSpotCheck.js | 668 --- .../fillion/containers/operational.js | 38 - .../src/sections/fillion/containers/patrol.js | 39 - .../fillion/containers/promotional.js | 35 - .../src/sections/fillion/containers/public.js | 38 - .../src/sections/fillion/containers/task.js | 186 - .../fillion/containers/transportation.js | 40 - .../fillion/containers/videoCenter.js | 30 - .../sections/fillion/containers/videois.js | 243 - .../client/src/sections/fillion/index.js | 13 - .../client/src/sections/fillion/nav-item.js | 115 - .../src/sections/fillion/reducers/index.js | 5 - .../client/src/sections/fillion/routes.js | 197 - .../client/src/sections/fillion/style.less | 3 - .../organization/actions/authority.js | 63 - .../sections/organization/actions/index.js | 11 - .../src/sections/organization/actions/user.js | 123 - .../organization/components/depModal.js | 140 - .../organization/components/resetPwd.js | 74 - .../organization/components/resource.js | 119 - .../organization/components/userModal.js | 206 - .../organization/containers/authority.js | 290 -- .../sections/organization/containers/index.js | 7 - .../sections/organization/containers/user.js | 460 -- .../client/src/sections/organization/index.js | 15 - .../src/sections/organization/nav-item.js | 39 - .../sections/organization/reducers/index.js | 5 - .../src/sections/organization/routes.js | 32 - .../src/sections/quanju/actions/example.js | 204 - .../src/sections/quanju/actions/index.js | 7 - .../src/sections/quanju/containers/example.js | 79 - .../footer/build/AutoRollComponent.js | 139 - .../containers/footer/build/Leftbottom.js | 296 -- .../containers/footer/build/Leftcenter.js | 7 - .../quanju/containers/footer/build/Lefttop.js | 7 - .../containers/footer/build/Rightbottom.js | 244 - .../containers/footer/build/Rightcenter.js | 92 - .../containers/footer/build/Righttop.js | 7 - .../quanju/containers/footer/build/index.js | 354 -- .../quanju/containers/footer/build/style.less | 494 -- .../containers/footer/build/videoMonitor.js | 88 - .../footer/conserve/action/index.js | 48 - .../footer/conserve/chart/pie-chart.js | 149 - .../containers/footer/conserve/index.js | 55 - .../quanju/containers/footer/conserve/left.js | 16 - .../containers/footer/conserve/left/Lb.js | 101 - .../footer/conserve/left/left-bottom.js | 71 - .../footer/conserve/left/left-center.js | 139 - .../footer/conserve/left/left-top.js | 245 - .../containers/footer/conserve/left/lun.less | 7 - .../containers/footer/conserve/left/lunbo.js | 110 - .../footer/conserve/left/lunbozujian.js | 99 - .../footer/conserve/left/shituzujian.js | 168 - .../containers/footer/conserve/left/zhexin.js | 282 -- .../containers/footer/conserve/left/zidong.js | 139 - .../containers/footer/conserve/right.js | 16 - .../footer/conserve/right/right-bottom.js | 96 - .../footer/conserve/right/right-center.js | 144 - .../footer/conserve/right/right-top.js | 177 - .../quanju/containers/footer/gis/bounds.js | 189 - .../quanju/containers/footer/gis/gis.js | 579 --- .../quanju/containers/footer/gis/mock_data.js | 59 - .../containers/footer/guanli/LeftItem.js | 121 - .../quanju/containers/footer/guanli/index.js | 265 -- .../containers/footer/guanli/style.less | 310 -- .../quanju/containers/footer/index.js | 29 - .../footer/leadership/centerLeft.js | 18 - .../footer/leadership/centerRight.js | 19 - .../centerRight/center-right-bottom.js | 14 - .../centerRight/center-right-center.js | 14 - .../centerRight/center-right-centertop.js | 14 - .../centerRight/center-right-top.js | 15 - .../footer/leadership/centerleft/bottom.js | 29 - .../centerleft/center-left-bottom.js | 30 - .../leadership/centerleft/center-left-top.js | 33 - .../footer/leadership/centerleft/conter.less | 98 - .../footer/leadership/centerleft/daolu.js | 154 - .../centerleft/echarts/centerleftecharts.js | 215 - .../footer/leadership/centerleft/handong.js | 133 - .../footer/leadership/centerleft/huadong.js | 184 - .../footer/leadership/centerleft/hudong.js | 166 - .../footer/leadership/centerleft/left.less | 98 - .../centerleft/lunbo/bottomlunbo.js | 49 - .../leadership/centerleft/lunbo/style.less | 11 - .../leadership/centerleft/lunbo/toplunbo.js | 50 - .../footer/leadership/centerleft/qiqoliang.js | 128 - .../footer/leadership/centerleft/top.js | 81 - .../containers/footer/leadership/index.js | 30 - .../containers/footer/leadership/left.js | 18 - .../left/echarts/leftbottomecharts.js | 185 - .../leadership/left/echarts/lefttopecharts.js | 250 - .../footer/leadership/left/left-bottom.js | 16 - .../footer/leadership/left/left-center.js | 141 - .../footer/leadership/left/left-top.js | 87 - .../containers/footer/leadership/right.js | 17 - .../footer/leadership/right/hudong.js | 186 - .../footer/leadership/right/hudongVideo.js | 214 - .../footer/leadership/right/left.less | 98 - .../footer/leadership/right/lunbo.js | 139 - .../footer/leadership/right/right-bottom.js | 139 - .../footer/leadership/right/right-center.js | 11 - .../footer/leadership/right/right-top.js | 153 - .../containers/footer/operation/index.js | 40 - .../containers/footer/operation/left.js | 206 - .../containers/footer/operation/right.js | 171 - .../containers/footer/operation/style.less | 101 - .../sections/quanju/containers/heand/index.js | 54 - .../quanju/containers/heand/style.less | 40 - .../src/sections/quanju/containers/index.js | 6 - .../quanju/containers/noContent/index.js | 0 .../quanju/containers/public/font.css | 4 - .../quanju/containers/public/left.less | 25 - .../quanju/containers/public/lunbo.js | 139 - .../quanju/containers/public/module.js | 23 - .../quanju/containers/public/noData.js | 7 - .../quanju/containers/public/olMap.js | 924 ---- .../client/src/sections/quanju/index.js | 15 - .../client/src/sections/quanju/nav-item.js | 17 - .../src/sections/quanju/reducers/index.js | 5 - .../client/src/sections/quanju/routes.js | 14 - .../client/src/sections/quanju/style.less | 13 - web-network/config.js | 153 +- web-network/package.json | 2 +- web/client/src/layout/actions/global.js | 3 +- web/client/src/layout/reducers/global.js | 6 +- .../sections/analysis/containers/network.jsx | 5 +- web/config.js | 13 +- web/package.json | 2 +- web/routes/attachment/index.js | 5 +- 190 files changed, 101 insertions(+), 34365 deletions(-) delete mode 100644 web-network/client/src/sections/fillion/actions/allDepUsers.js delete mode 100644 web-network/client/src/sections/fillion/actions/appointTask.js delete mode 100644 web-network/client/src/sections/fillion/actions/assess.js delete mode 100644 web-network/client/src/sections/fillion/actions/compile.js delete mode 100644 web-network/client/src/sections/fillion/actions/config.js delete mode 100644 web-network/client/src/sections/fillion/actions/extract.js delete mode 100644 web-network/client/src/sections/fillion/actions/file.js delete mode 100644 web-network/client/src/sections/fillion/actions/index.js delete mode 100644 web-network/client/src/sections/fillion/actions/infor.js delete mode 100644 web-network/client/src/sections/fillion/actions/luzheng.js delete mode 100644 web-network/client/src/sections/fillion/actions/patrol.js delete mode 100644 web-network/client/src/sections/fillion/actions/task.js delete mode 100644 web-network/client/src/sections/fillion/components/assessModal.js delete mode 100644 web-network/client/src/sections/fillion/components/bridgeTable.js delete mode 100644 web-network/client/src/sections/fillion/components/buildingTable.js delete mode 100644 web-network/client/src/sections/fillion/components/datajuji.js delete mode 100644 web-network/client/src/sections/fillion/components/editGuanlang.js delete mode 100644 web-network/client/src/sections/fillion/components/enforceTable.js delete mode 100644 web-network/client/src/sections/fillion/components/feedback/nominateModal.js delete mode 100644 web-network/client/src/sections/fillion/components/feedback/nominateModalcopy.js delete mode 100644 web-network/client/src/sections/fillion/components/file/functionMenu.js delete mode 100644 web-network/client/src/sections/fillion/components/file/menu.less delete mode 100644 web-network/client/src/sections/fillion/components/file/roadModal.js delete mode 100644 web-network/client/src/sections/fillion/components/file/uploadModal.js delete mode 100644 web-network/client/src/sections/fillion/components/fileTable.js delete mode 100644 web-network/client/src/sections/fillion/components/gis/bounds.js delete mode 100644 web-network/client/src/sections/fillion/components/gis/mock_data.js delete mode 100644 web-network/client/src/sections/fillion/components/gis/patrolGis.js delete mode 100644 web-network/client/src/sections/fillion/components/highways/guanli.js delete mode 100644 web-network/client/src/sections/fillion/components/highways/highwaysdata.js delete mode 100644 web-network/client/src/sections/fillion/components/highwaysTable.js delete mode 100644 web-network/client/src/sections/fillion/components/infor/details.js delete mode 100644 web-network/client/src/sections/fillion/components/infor/videoUpload.js delete mode 100644 web-network/client/src/sections/fillion/components/inforTable.js delete mode 100644 web-network/client/src/sections/fillion/components/luzhengmodel.js delete mode 100644 web-network/client/src/sections/fillion/components/maintenanceTable.js delete mode 100644 web-network/client/src/sections/fillion/components/maintenanceTable.less delete mode 100644 web-network/client/src/sections/fillion/components/operationalTable.js delete mode 100644 web-network/client/src/sections/fillion/components/patrolTable.js delete mode 100644 web-network/client/src/sections/fillion/components/project/project.js delete mode 100644 web-network/client/src/sections/fillion/components/promotionalTable.js delete mode 100644 web-network/client/src/sections/fillion/components/protable.less delete mode 100644 web-network/client/src/sections/fillion/components/publicTable.js delete mode 100644 web-network/client/src/sections/fillion/components/task/addTaskModal.js delete mode 100644 web-network/client/src/sections/fillion/components/transportationTable.js delete mode 100644 web-network/client/src/sections/fillion/components/uploads.js delete mode 100644 web-network/client/src/sections/fillion/components/videoTable.js delete mode 100644 web-network/client/src/sections/fillion/containers/assess.js delete mode 100644 web-network/client/src/sections/fillion/containers/bridge.js delete mode 100644 web-network/client/src/sections/fillion/containers/building.js delete mode 100644 web-network/client/src/sections/fillion/containers/enforce.js delete mode 100644 web-network/client/src/sections/fillion/containers/file.js delete mode 100644 web-network/client/src/sections/fillion/containers/highways.js delete mode 100644 web-network/client/src/sections/fillion/containers/index.js delete mode 100644 web-network/client/src/sections/fillion/containers/infor.js delete mode 100644 web-network/client/src/sections/fillion/containers/jiekouguanli.js delete mode 100644 web-network/client/src/sections/fillion/containers/luzheng.js delete mode 100644 web-network/client/src/sections/fillion/containers/maintenance.js delete mode 100644 web-network/client/src/sections/fillion/containers/maintenanceSpotCheck.js delete mode 100644 web-network/client/src/sections/fillion/containers/operational.js delete mode 100644 web-network/client/src/sections/fillion/containers/patrol.js delete mode 100644 web-network/client/src/sections/fillion/containers/promotional.js delete mode 100644 web-network/client/src/sections/fillion/containers/public.js delete mode 100644 web-network/client/src/sections/fillion/containers/task.js delete mode 100644 web-network/client/src/sections/fillion/containers/transportation.js delete mode 100644 web-network/client/src/sections/fillion/containers/videoCenter.js delete mode 100644 web-network/client/src/sections/fillion/containers/videois.js delete mode 100644 web-network/client/src/sections/fillion/index.js delete mode 100644 web-network/client/src/sections/fillion/nav-item.js delete mode 100644 web-network/client/src/sections/fillion/reducers/index.js delete mode 100644 web-network/client/src/sections/fillion/routes.js delete mode 100644 web-network/client/src/sections/fillion/style.less delete mode 100644 web-network/client/src/sections/organization/actions/authority.js delete mode 100644 web-network/client/src/sections/organization/actions/index.js delete mode 100644 web-network/client/src/sections/organization/actions/user.js delete mode 100644 web-network/client/src/sections/organization/components/depModal.js delete mode 100644 web-network/client/src/sections/organization/components/resetPwd.js delete mode 100644 web-network/client/src/sections/organization/components/resource.js delete mode 100644 web-network/client/src/sections/organization/components/userModal.js delete mode 100644 web-network/client/src/sections/organization/containers/authority.js delete mode 100644 web-network/client/src/sections/organization/containers/index.js delete mode 100644 web-network/client/src/sections/organization/containers/user.js delete mode 100644 web-network/client/src/sections/organization/index.js delete mode 100644 web-network/client/src/sections/organization/nav-item.js delete mode 100644 web-network/client/src/sections/organization/reducers/index.js delete mode 100644 web-network/client/src/sections/organization/routes.js delete mode 100644 web-network/client/src/sections/quanju/actions/example.js delete mode 100644 web-network/client/src/sections/quanju/actions/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/example.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/AutoRollComponent.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Leftbottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Leftcenter.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Lefttop.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Rightbottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Rightcenter.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/Righttop.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/style.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/build/videoMonitor.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/action/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/chart/pie-chart.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/Lb.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/left-center.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/left-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/lun.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/lunbo.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/shituzujian.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/zhexin.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/left/zidong.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/right.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/right/right-center.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/conserve/right/right-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/gis/bounds.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/gis/gis.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/gis/mock_data.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/guanli/LeftItem.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/guanli/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/guanli/style.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerLeft.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerRight.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-center.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-centertop.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/conter.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/echarts/centerleftecharts.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/huadong.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/left.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/bottomlunbo.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/style.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left/left-center.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/left/left-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/hudong.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/hudongVideo.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/left.less delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/lunbo.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/right-center.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/leadership/right/right-top.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/operation/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/operation/left.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/operation/right.js delete mode 100644 web-network/client/src/sections/quanju/containers/footer/operation/style.less delete mode 100644 web-network/client/src/sections/quanju/containers/heand/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/heand/style.less delete mode 100644 web-network/client/src/sections/quanju/containers/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/noContent/index.js delete mode 100644 web-network/client/src/sections/quanju/containers/public/font.css delete mode 100644 web-network/client/src/sections/quanju/containers/public/left.less delete mode 100644 web-network/client/src/sections/quanju/containers/public/lunbo.js delete mode 100644 web-network/client/src/sections/quanju/containers/public/module.js delete mode 100644 web-network/client/src/sections/quanju/containers/public/noData.js delete mode 100644 web-network/client/src/sections/quanju/containers/public/olMap.js delete mode 100644 web-network/client/src/sections/quanju/index.js delete mode 100644 web-network/client/src/sections/quanju/nav-item.js delete mode 100644 web-network/client/src/sections/quanju/reducers/index.js delete mode 100644 web-network/client/src/sections/quanju/routes.js delete mode 100644 web-network/client/src/sections/quanju/style.less diff --git a/web-network/client/src/app.js b/web-network/client/src/app.js index b2496dd..d1dfd08 100644 --- a/web-network/client/src/app.js +++ b/web-network/client/src/app.js @@ -3,9 +3,6 @@ import React, { useEffect } from 'react'; import Layout from './layout'; import Auth from './sections/auth'; -import Quanju from './sections/quanju'; -import Organization from './sections/organization' -import Fillion from './sections/fillion' import Network from './sections/network' @@ -19,7 +16,7 @@ const App = props => { return ( ) } diff --git a/web-network/client/src/layout/containers/layout/index.js b/web-network/client/src/layout/containers/layout/index.js index 5faa2e2..e2a9a3d 100644 --- a/web-network/client/src/layout/containers/layout/index.js +++ b/web-network/client/src/layout/containers/layout/index.js @@ -7,7 +7,7 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'react-redux'; import { message, Layout, Breadcrumb, Badge } from 'antd'; import Sider from '../../components/sider'; -import { getDepMessage } from "../../../sections/organization/actions/user" +// import { getDepMessage } from "../../../sections/organization/actions/user" import Header from '../../components/header'; import Footer from '../../components/footer'; import Breadcrumbs from './breadcrumb'; @@ -46,10 +46,10 @@ const LayoutContainer = props => { )); } useEffect(() => { - if (user && user.authorized) - dispatch(getDepMessage()).then((res) => { - setDepMessage(res) - }) + // if (user && user.authorized) + // dispatch(getDepMessage()).then((res) => { + // setDepMessage(res) + // }) }, [user]) useEffect(() => { resize_() diff --git a/web-network/client/src/sections/auth/containers/login.js b/web-network/client/src/sections/auth/containers/login.js index e7eb603..7c77bfa 100644 --- a/web-network/client/src/sections/auth/containers/login.js +++ b/web-network/client/src/sections/auth/containers/login.js @@ -5,7 +5,7 @@ import { push } from 'react-router-redux'; import { Button, Input, Form, Row, Col, message } from 'antd'; import { login } from '../actions/auth'; import './style.less'; -import leftTop from '../../quanju/containers/footer/conserve/left/left-top'; +// import leftTop from '../../quanju/containers/footer/conserve/left/left-top'; const FormItem = Form.Item; const Login = props => { diff --git a/web-network/client/src/sections/fillion/actions/allDepUsers.js b/web-network/client/src/sections/fillion/actions/allDepUsers.js deleted file mode 100644 index 7aac192..0000000 --- a/web-network/client/src/sections/fillion/actions/allDepUsers.js +++ /dev/null @@ -1,14 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getAllDepUsers(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_AllDEPUSERS', - url: ApiTable.getAllDepUsers, - msg: { option: '获取部门下的所有员工' },//子部门算在第一级部门下面 - reducer: { name: 'allDepUsers' } - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/appointTask.js b/web-network/client/src/sections/fillion/actions/appointTask.js deleted file mode 100644 index 4b359c3..0000000 --- a/web-network/client/src/sections/fillion/actions/appointTask.js +++ /dev/null @@ -1,24 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function appointTask(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_APPOINT_TASK', - url: ApiTable.appointTask, - msg: { option: '指派任务' }, - }); -} - -export function pushAppointSMS(data) { - return dispatch => basicAction({ - type: 'post', - data, - dispatch: dispatch, - actionType: 'PUSH_APPOINT_SMS', - url: ApiTable.pushAppointSMS, - msg: { option: '发送指派信息' }, - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/assess.js b/web-network/client/src/sections/fillion/actions/assess.js deleted file mode 100644 index e76f4bd..0000000 --- a/web-network/client/src/sections/fillion/actions/assess.js +++ /dev/null @@ -1,35 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getAssess (query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_ASSESS', - url: ApiTable.getAssess, - msg: { error: '获取考核评分信息' }, - reducer: { name: 'assess' } - }); -} - -export function delAssess (query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_ASSESS', - url: ApiTable.delAssess.replace("{assessId}", query?.id), - msg: { option: '删除考核评分信息' }, - }); -} - -export function editAssess (query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_ASSESS', - url: ApiTable.editAssess, - msg: { option: '编辑/新增考核评分信息' }, - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/compile.js b/web-network/client/src/sections/fillion/actions/compile.js deleted file mode 100644 index b1cdd18..0000000 --- a/web-network/client/src/sections/fillion/actions/compile.js +++ /dev/null @@ -1,37 +0,0 @@ -// 'use strict'; - -// import { basicAction } from '@peace/utils' -// import { ApiTable } from '$utils' - -// export function reportRectify (timeRange) { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// actionType: 'GET_REPORT_RECTIFY', -// url: `${ApiTable.getReportRectify}?startTime=${timeRange ? timeRange[0] : ''}&endTime=${timeRange ? timeRange[1] : ''}`, -// msg: {}, -// reducer: { name: 'reportRectify' } -// }); -// } - -// export function reportRectifyDetail (day, depId) { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// actionType: 'GET_REPORT_RECTIFY_DETAIL', -// url: `${ApiTable.getReportRectifyDetail}?day=${day}&depId=${depId}`, -// msg: {}, -// reducer: { name: 'reportRectifyDetail' } -// }); -// } - -// export function compileReportRectifyDetail (data) { -// return dispatch => basicAction({ -// type: 'post', -// dispatch: dispatch, -// data, -// actionType: 'COMPILE_REPORT_RECTIFY_DETAIL', -// url: `${ApiTable.compileReportRectifyDetail}`, -// msg: { option: '保存信息' }, -// }); -// } \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/config.js b/web-network/client/src/sections/fillion/actions/config.js deleted file mode 100644 index adf6ce9..0000000 --- a/web-network/client/src/sections/fillion/actions/config.js +++ /dev/null @@ -1,59 +0,0 @@ -// 'use strict'; - -// import { basicAction } from '@peace/utils' -// import { ApiTable } from '$utils' - -// export function allAreas (orgId) { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// actionType: 'GET_ALL_AREAS', -// url: `${ApiTable.allAreas}`, -// msg: {}, -// reducer: { name: 'allAreas' } -// }); -// } - -// export function addReportConfig (data) { -// return dispatch => basicAction({ -// type: 'post', -// dispatch: dispatch, -// data: data, -// actionType: 'POST_REPORT_CONFIGS', -// url: `${ApiTable.addReportConfig}`, -// msg: { option: '添加报表配置' }, -// }); -// } - -// export function getReportConfig () { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// actionType: 'GET_REPORT_CONFIGS', -// url: `${ApiTable.getReportConfig}`, -// msg: { error: '获取报表配置失败' }, -// reducer: { name: 'reportConfig' } -// }); -// } - -// export function editReportConfig (data, configId) { -// return dispatch => basicAction({ -// type: 'put', -// dispatch: dispatch, -// data: data, -// actionType: 'EDIT_REPORT_CONFIGS', -// url: `${ApiTable.editReportConfig.replace('{reportId}', configId)}`, -// msg: { option: '编辑报表配置' }, -// }); -// } - -// export function delReportConfig (configId) { -// return dispatch => basicAction({ -// type: 'del', -// dispatch: dispatch, -// actionType: 'DEL_REPORT_CONFIGS', -// url: `${ApiTable.delReportConfig.replace('{reportId}', configId)}`, -// msg: { option: '删除报表配置' }, -// }); -// } - diff --git a/web-network/client/src/sections/fillion/actions/extract.js b/web-network/client/src/sections/fillion/actions/extract.js deleted file mode 100644 index 39790bf..0000000 --- a/web-network/client/src/sections/fillion/actions/extract.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getReportSpotPrepare(data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - data, - actionType: 'GET_REPORT_SPOT_PREPARE', - url: `${ApiTable.getReportSpotPrepare}`, - msg: { error: '查询随机乡镇失败' }, - }); -} - -export function getSpotCheck(data) { - return dispatch => basicAction({ - type: 'get', - query: data, - dispatch: dispatch, - actionType: 'GET_SPOT_CHECK', - url: `${ApiTable.getSpotCheck}`, - msg: { error: '随机抽查失败' }, - }); -} - - -export function getSpotCheckDetail(data) { - return dispatch => basicAction({ - type: 'get', - query: data, - dispatch: dispatch, - actionType: 'GET_SPOT_CHECK_Detail', - url: `${ApiTable.getSpotCheckDetail}`, - reducer: { name: 'spotCheckDetail' }, - msg: { error: '查询随机抽查明细失败' }, - }); -} - - - diff --git a/web-network/client/src/sections/fillion/actions/file.js b/web-network/client/src/sections/fillion/actions/file.js deleted file mode 100644 index 2b6adc7..0000000 --- a/web-network/client/src/sections/fillion/actions/file.js +++ /dev/null @@ -1,89 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - - -export function createFileDir(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'CREATE_FILE_DIR', - url: ApiTable.createFileDir, - query, - msg: { error: '创建文件夹失败' }, - // reducer: { name: 'uploadFile' } - }); -} - -export function delFileDir(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'DEL_FILE_DIR', - url: ApiTable.delFileDir, - query, - msg: { error: '删除文件夹失败' }, - // reducer: { name: 'uploadFile' } - }); -} - -export function queryFileDir(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'QUERY_FILE_DIR', - url: ApiTable.queryFileDIr, - query, - msg: { error: '查询文件夹失败' }, - reducer: { name: 'fileDirs' } - }); -} - -export function updateFileDir(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'UPDATE_FILE_DIR', - url: ApiTable.updateFileDir, - query, - msg: { error: '更新文件夹名称失败' }, - // reducer: { name: 'fileDirs' } - }); -} - - -// data : {typeId, userId, userName, startDate, endDate, fileSize, fileName, fileUrl, fileExt} -export function uploadFile(data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - actionType: 'UPLOAD_FILE', - url: ApiTable.uploadFile, - data, - msg: { error: '上传文件失败' }, - reducer: { name: 'uploadFile' } - }); -} - -export function deleteFile(id) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'DELETE_FILE', - url: ApiTable.deleteFile, - msg: { error: '删除文件数据失败' }, - query: { id }, - reducer: { name: 'fileDel' } - }); -} - -export function getFileList(query) { // fId, limit, offset, searchTxt - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_FILE_LIST', - url: ApiTable.getFileList, - query, - msg: { error: '获取档案数据失败' }, - reducer: { name: 'fileList' } - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/index.js b/web-network/client/src/sections/fillion/actions/index.js deleted file mode 100644 index 8a48b86..0000000 --- a/web-network/client/src/sections/fillion/actions/index.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -import * as infor from './infor' -import * as patrol from './patrol' -import * as file from './file' -import * as assess from './assess' -import * as allDepUsers from './allDepUsers' -import * as getReportSpotPrepare from './extract' -import * as luzheng from './luzheng' -export default { - ...infor, - ...patrol, - ...file, - ...assess, - ...allDepUsers, - ...getReportSpotPrepare, - ...luzheng -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/infor.js b/web-network/client/src/sections/fillion/actions/infor.js deleted file mode 100644 index a245f75..0000000 --- a/web-network/client/src/sections/fillion/actions/infor.js +++ /dev/null @@ -1,436 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' -import { Request } from '@peace/utils' - -export function getDepMessage() { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_DEPARTMENT_MESSAGE', - url: ApiTable.getDepMessage, - msg: { error: '获取部门信息失败' }, - reducer: { name: 'depMessage' } - }); -} -// export function getReportStatistic(query) { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// query: query, -// actionType: 'GET_DEPARTMENT_STATIS', -// url: ApiTable.getReportStatistic, -// msg: { error: '获取填报信息失败' }, -// reducer: { name: 'reportstatistic' } -// }); - -// } -export function getOperaTional(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_OPERA_TIONAL', - url: ApiTable.getOperaTional, - msg: { error: '获取客运信息失败' }, - - }); -} -export function putOperaTional(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_OPERA_TIONAL', - url: ApiTable.putOperaTional, - msg: { option: '编辑车辆信息' }, - - }); -} -export function getSpecificVehicle(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_SPECIFIC_VEHICLE', - url: ApiTable.getSpecificVehicle, - msg: { error: '获取车辆信息失败' }, - - }); -} -export function putSpecificVehicle(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'put_SPECIFIC_VEHICLE', - url: ApiTable.putSpecificVehicle, - msg: { option: '编辑车辆信息' }, - - }); -} -export function putHouseholds(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'put_HOUSEHOLDS', - url: ApiTable.putHouseholds, - msg: { option: '编辑业户信息' }, - - }); -} -export function getHouseholds(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_HOUSEHOLDS', - url: ApiTable.getHouseholds, - msg: { error: '获取业户信息失败' }, - - }); -} -export function getRoadway(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_ROADWAY', - url: ApiTable.getRoadway, - msg: { error: '获取道路信息失败' }, - - }); -} -export function putRoadway(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_ROADWAY', - url: ApiTable.putRoadway, - msg: { option: query?.roadId?'编辑':'新增' + '道路信息' }, - }); -} -export function getBridge(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_BRIDGE', - url: ApiTable.getBridge, - msg: { error: '获取桥梁信息失败' }, - - }); -} -export function putBridge(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_BRIDGE', - url: ApiTable.putBridge, - msg: { option: '编辑桥梁信息' }, - - }); -} -export function getProject(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_PROJECT', - url: ApiTable.getProject, - msg: { error: '获取工程信息失败' }, - reducer: { name: 'projectList' } - }); -} -export function putProject(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'GET_PROJECT', - url: ApiTable.putProject, - msg: { option: '编辑工程信息' }, - - }); -} -export function getHighways(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_HIGHWAYS', - url: ApiTable.getHighways, - msg: { error: '获取设施统计信息失败' }, - - }); -} -export function putHighways(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'GET_HIGHWAYS', - url: ApiTable.putHighways, - msg: { option: '编辑设施统计信息' }, - - }); -} -export function getCircuit(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_CIRCUIT', - url: ApiTable.getCircuit, - msg: { error: '获取线路信息失败' }, - - }); -} -export function putCircuit(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_CIRCUIT', - url: ApiTable.putCircuit, - msg: { option: '编辑线路信息' }, - - }); -} -export function getVehicle(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_VEHICLE', - url: ApiTable.getVehicle, - msg: { error: '获取车辆信息失败' }, - - }); -} -export function putVehicle(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_VEHICLE', - url: ApiTable.putVehicle, - msg: { option: '编辑车辆信息' }, - - }); -} -export function delRoadway(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_ROADWAY', - url: ApiTable.delRoadway.replace("{roadId}", query?.roadId), - msg: { option: '删除车辆信息' }, - - }); -} -export function delProject(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_PROJECT', - url: ApiTable.delProject.replace("{projectId}", query?.projectId), - msg: { option: '删除工程信息' }, - - }); -} -export function delBridge(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_BRIDGE', - url: ApiTable.delBridge.replace("{bridgeId}", query?.bridgeId), - msg: { option: '删除桥梁信息' }, - - }); -} -export function delSpecificVehicle(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_SPECIFICVENICLE', - url: ApiTable.delSpecificVehicle.replace("{vehicleId}", query?.vehicleId), - msg: { option: '删除车辆信息' }, - - }); -} -export function delHouseholds(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_HOUSEHOLDS', - url: ApiTable.delHouseholds.replace("{businessId}", query?.businessId), - msg: { option: '删除业户信息' }, - - }); -} -export function delCircuit(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_CIRCUIT', - url: ApiTable.delCircuit.replace("{lineId}", query?.lineId), - msg: { option: '删除运营线路信息' }, - - }); -} -export function delVehicle(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_VEHICLE', - url: ApiTable.delVehicle.replace("{carId}", query?.carId), - msg: { option: '删除车辆信息' }, - - }); -} - -export function getPurchase(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_PURCHASE', - url: ApiTable.getPurchase, - msg: { error: '获取治超信息失败' }, - - }); -} -export function putPurchase(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_PURCHASE', - url: ApiTable.putPurchase, - msg: { option: '编辑治超信息' }, - - }); -} -export function delPurchase(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_PURCHASE', - url: ApiTable.delPurchase.replace("{overspeedId}", query?.overspeedId), - msg: { option: '删除车辆信息' }, - - }); -} - -export function getPropagata(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_PROPAGATA', - url: ApiTable.getpropagata, - msg: { error: '获取宣传视频信息失败' }, - // reducer: { name: 'reportstatistic' } - }); -} -export function putAddPropagata(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_PROPAGATA', - url: ApiTable.putpropagata, - msg: { option: '新增宣传视频' }, - // reducer: { name: 'reportstatistic' } - }); -} -export function putEditPropagata(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_PROPAGATA', - url: ApiTable.putpropagata, - msg: { option: '编辑宣传视频' }, - // reducer: { name: 'reportstatistic' } - }); -} -export function delPropagata(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_PROPAGATA', - url: ApiTable.delpropagata.replace("{publicityId}", query?.publicityId), - msg: { option: '删除宣传视频信息' }, - // reducer: { name: 'reportstatistic' } - }); -} - -export function getShippingList(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_SHIPPING_LIST', - url: ApiTable.getShippingList, - msg: { error: '获取货运信息失败' }, - }); -} - -export function putShippingList(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_SHIPPING_LIST', - url: ApiTable.putShippingList, - msg: { option: '编辑货运信息' }, - }); -} -//获取管养单位概况 -export function getCustodyunit() { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_CUSTODY_UNIT', - url: ApiTable.getCustodyunit, - msg: { error: '获取管养单位概况失败' }, - reducer: { name: 'roadMaintenances_management' } - }); -} -export function getCustodyunitOne(query) { - return dispatch => basicAction({ - type: 'get', - query:query, - dispatch: dispatch, - actionType: 'GET_CUSTODY_UNIT_ONE', - url: ApiTable.getCustodyunit, - msg: { error: '获取管养单位概况失败' }, - // reducer: { name: 'roadMaintenances_management' } - }); -} -export function postCustodyunit(query) { - return dispatch => basicAction({ - type: 'post', - data: query, - dispatch: dispatch, - actionType: 'POST_CUSTODY_UNIT', - url: ApiTable.postCustodyunit, - msg: { option: '编辑管养单位概况' }, - // reducer: { name: 'roadMaintenances' } - }); -} -export function getxiuyangas(query) { - return dispatch => basicAction({ - type: 'get', - query, - dispatch: dispatch, - actionType: 'GET_XIUYANG', - url: ApiTable.getXiuyang, - msg: { error: '获取信息失败' }, - reducer: { name: 'xiuyang' } - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/luzheng.js b/web-network/client/src/sections/fillion/actions/luzheng.js deleted file mode 100644 index 5c4a0a1..0000000 --- a/web-network/client/src/sections/fillion/actions/luzheng.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' -export function getRoadadministration (query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_LU_ZHENG', - url: ApiTable.getRoadadministration, - msg: { option: '获取路政信息' }, - // reducer: { name: 'chcekList' } - }); -} - - -export function addRoadadministration (params) { - return dispatch => basicAction({ - type: 'post', - data: params, - dispatch: dispatch, - actionType: 'ADD_LU_ZHENG', - url: ApiTable.addRoadadministration, - msg: { option: '新增路政信息' }, - }); -} - - -export function delRoadadministration (id) { - return dispatch => basicAction({ - type: 'delete', - dispatch: dispatch, - actionType: 'DEL_LU_ZHENG', - url: ApiTable.delRoadadministration.replace(':id', id), - msg: { option: '删除路政信息' }, - }) -} -export function modifyRoadadministration (id, params) { - return dispatch => basicAction({ - type: 'put', - data: params, - dispatch: dispatch, - actionType: 'EDIT_LU_ZHENG', - url: ApiTable.modifyRoadadministration.replace(':id', id), - msg: { option: '修改路政信息' }, - }); -} - - - diff --git a/web-network/client/src/sections/fillion/actions/patrol.js b/web-network/client/src/sections/fillion/actions/patrol.js deleted file mode 100644 index 6d7f606..0000000 --- a/web-network/client/src/sections/fillion/actions/patrol.js +++ /dev/null @@ -1,73 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - - -export function getReportList (query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_REPORT_LIST', - url: ApiTable.getReportList, - query, - msg: { error: '获取巡查数据失败' }, - reducer: { name: 'reportList' } - }); -} - -export function getReportDetail (reportId) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_REPORT_DETAIL_LIST', - url: ApiTable.getReportDetail.replace("{reportId}", reportId), - msg: { error: '获取巡查数据失败' }, - reducer: { name: 'reportDetail' } - }); -} - -export function getUserList (query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_USER_LIST', - url: ApiTable.getUsers, - query, - msg: { error: '获取用户数据失败' }, - reducer: { name: 'userList' } - }); -} - -export function handleReport (reportId, data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - actionType: 'HANDLE_REPORT', - url: ApiTable.handleReport.replace("{reportId}", reportId), - data: data, - msg: { option: '处理数据' }, - }); -} - - -export function getAnspectionNotificationPhone (query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_ANSPECTION_NOTIFICATION_PHONE', - url: ApiTable.getAnspectionNotificationPhone, - query, - msg: { error: '获取短信提醒电话' }, - reducer: { name: 'anspectionNotificationPhoneList' } - }); -} - -export function addAnspectionNotificationPhone (data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - actionType: 'POST_ANSPECTION_NOTIFICATION_PHONE', - url: ApiTable.getAnspectionNotificationPhone, - data: data, - msg: { option: '添加短信提醒' }, - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/actions/task.js b/web-network/client/src/sections/fillion/actions/task.js deleted file mode 100644 index da5adf8..0000000 --- a/web-network/client/src/sections/fillion/actions/task.js +++ /dev/null @@ -1,35 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getTask(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_TASK', - url: ApiTable.getTask, - msg: { error: '获取任务信息' }, - reducer: { name: 'task' } - }); -} - -export function delTask(query) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_TASK', - url: ApiTable.delTask.replace("{taskId}", query?.id), - msg: { option: '删除任务信息' }, - }); -} - -export function editTask(query) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: query, - actionType: 'PUT_TASK', - url: ApiTable.editTask, - msg: { option: '编辑或新增任务信息' }, - }); -} \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/components/assessModal.js b/web-network/client/src/sections/fillion/components/assessModal.js deleted file mode 100644 index 0325a70..0000000 --- a/web-network/client/src/sections/fillion/components/assessModal.js +++ /dev/null @@ -1,112 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { connect } from 'react-redux'; -import { Form, Input, Select, DatePicker, InputNumber, Button, Modal } from 'antd'; -import { unitList } from '../containers/assess' -import { getAssess, delAssess, editAssess } from '../actions/assess'; -import moment from 'moment'; - -const { Option } = Select; - -const AssessModal = ({ editData, check, visible, onCancel, dispatch }) => { - const [form] = Form.useForm(); - const [loading, setLoading] = useState(false); - - return ( - { - if (check) { - return onCancel() - } - setLoading(true) - form.validateFields().then(values => { - dispatch(editAssess({ - ...values, - month: moment(values.month).format('YYYY-MM-DD'), - assessId: editData ? editData.id : undefined - })).then(res => { - if (res.success) { - onCancel() - } - setLoading(false) - }) - }) - }} - onCancel={() => { - onCancel() - }} - confirmLoading={loading} - > -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - ); -}; - -function mapStateToProps (state) { - const { auth, assess } = state - return { - user: auth.user, - assess: assess.data || [] - } -} -export default connect(mapStateToProps)(AssessModal); diff --git a/web-network/client/src/sections/fillion/components/bridgeTable.js b/web-network/client/src/sections/fillion/components/bridgeTable.js deleted file mode 100644 index 1f9b43b..0000000 --- a/web-network/client/src/sections/fillion/components/bridgeTable.js +++ /dev/null @@ -1,2019 +0,0 @@ -import React, { useEffect, useState, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Button, Popconfirm, Badge } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import './protable.less' -import moment from 'moment'; -import { getBridge, getProject, delBridge, delProject } from "../actions/infor" -import UserModal from './infor/details'; -import ProjectModal from './project/project'; - -const BrideTable = (props) => { - const { dispatch, user, depData, depMessage, depLoading } = props - const [rowSelected, setRowSelected] = useState([]) - // const [regionId, setRegionId] = useState()//区域id - // const [placeType, setPlaceType] = useState()//场所 - // const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期 - const [sitename, setSitename] = useState()//场所名称 - const [counts, setCounts] = useState()//shuju - const [modalVisible, setModalVisible] = useState(false); - const [modalVisibleyilan, setModalVisibleyilan] = useState(false); - const [modalRecord, setModalRecord] = useState(); - const [typecard, setTypecard] = useState(); - const [activeKey, setActiveKey] = useState('tab1'); - const [recortd, setRecortd] = useState() - const [whichofits, setWhichofits] = useState('qiaoliang') - const [delet, setDelet] = useState() - const [differentiate, setDifferentiate] = useState('bridge') - const [smallBridge, setSmallBridge] = useState([]) - const [middleBridge, setMiddleBridge] = useState([]) - const [bigBridge, setBigBridge] = useState([]) - const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'BRIDGEMANAGE')[0].isshow === "true" ? true : '') - const ref = useRef() - useEffect(() => { ref.current.reload() }, [whichofits, delet]) - const deldata = (id) => { // 桥梁 - const query = { - bridgeId: id - } - dispatch(delBridge(query)).then((res) => { - setDelet(res) - }) - } - useEffect(async () => { - const res = await dispatch(getBridge()) - setSmallBridge(res.payload.data?.filter(item => item.bridgeClassification === '小桥')) - setMiddleBridge(res.payload.data?.filter(item => item.bridgeClassification === '中桥')) - setBigBridge(res.payload.data?.filter(item => item.bridgeClassification === '大桥')) - }, []) - const deldatas = (id) => { // 工程 - const query = { - projectId: id - } - dispatch(delProject(query)).then((res) => { - setDelet(res) - }) - } - const columns = { - tab1: [ - { - title: '桥梁代码', - dataIndex: 'placeName1', - fixed: 'left', - width: 120, - options: 1, - search: false, - backgroundColor: "#ffffff", - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - render: (dom, record) => { - // console.log(record) - return record.bridgeCode - }, - }, - { - title: '桥梁名称', - dataIndex: 'placeName', - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.bridgeName - }, - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, - placeholder: '请输入桥梁名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - }, - { - title: '中心桩号', - search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', - width: 120, - render: (dom, record) => { - return record.centralStation - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '跨越地物类型', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.crossingFigureType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物名称', - search: false, - dataIndex: 'time4', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.crossingFigureName - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '收费性质', - search: false, - dataIndex: 'time5', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.natureOfCharges - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '匝道编码', - search: false, - dataIndex: 'time6', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.rampCode - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段类型', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.sectionType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物类型', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.crossingFigureType1 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.crossingFigureName1 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原桥梁代码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.originalBridgeCode - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否宽路窄桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.whetherWideRoadAndNarrowBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否在长大桥梁目录中', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.isItInTheDirectoryOfLongAndLongBridges - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否跨省桥梁', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.whetherItIsACrossProvincialBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.interworkingType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通形式', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.interworkingForm - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通交叉方式', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.interworkingAndCrossoverMode - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁分类', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.bridgeClassification - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁全长', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.totalLengthOfBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径总长', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.totalSpanLength - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主桥主跨', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.mainSpanOfMainBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主桥孔数', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.numberOfMainBridgeHoles - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.bridgeProperties - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计荷载等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.designLoadClass - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上部结构', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.superstructure - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上部结构材料', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.superstructureMaterials - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面铺装类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.bridgeDeckPavementType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面宽', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.bridgeDeckWidth - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面净宽', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.clearWidthOfBridgeDeck - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥下净空', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.clearanceUnderBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '抗震等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.seismicGrade - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '通航等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.navigationClass - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥台类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.abutmentType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥墩类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.pierType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '墩台防撞设施类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.typesOfPierAndAbutmentAntiCollisionFacilities - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '伸缩缝类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.expansionJointType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '支座类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.supportType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '弯坡斜特征', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.characteristicsOfCurvedSlope - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁高度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.bridgeHeight - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '人行道宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.sidewalkWidth - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建设单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.constructionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建成时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.completionTime - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '通车日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.openingDate - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改建时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.reconstructionTime - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '总造价', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.totalCost - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.nameOfDesignUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '施工单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.nameOfConstructionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监理单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.nameOfSupervisionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建设性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.natureOfConstruction - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '评定日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.evaluationDate - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '技术状况评定', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.technicalConditionEvaluation - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '评定单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.assessmentUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主要病害位置', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.locationOfMajorDiseases - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '病害描述', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.diseaseDescription - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '采取管制措施', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.takeControlMeasures - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '最近定期检查日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.dateOfLastPeriodicInspection - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.natureOfManagementAndMaintenanceUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.managementAndMaintenanceUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监管单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.supervisionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造施工单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.reconstructionConstructionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否部补助项目', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.whetherItIsASubsidyProjectOfTheMinistry - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '工程性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.engineeringProperties - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造部位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.reconstructionPart - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造完工日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.modificationCompletionDate - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.year1 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination1 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.investment1 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.year2 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination2 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.investment2 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.year3 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination3 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.investment3 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.year4 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '跨径组合4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination4 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.investment4 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.year5 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.spanCombination5 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.investment5 - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.plannedFundCategory - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.plannedYear - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.planDocumentNo - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.planItemUniqueCode - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.plannedProjectType - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.planProjectName - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.ccompletionStatus - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.yearOfCompletion - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更原因', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.reasonForChange - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.changeTime - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '填报单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.reportingUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.remarks - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否跨线桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.whetherOverpassBridge - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否线外桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.offLineBridgeOrNot - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否危桥改造', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.whetherDangerousBridgeReconstruction - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在区县', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.districtcounty - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在地市', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.locationCity - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 160, - fixed: 'right', - render: (dom, record) => { - return
- { deldata(record.id) }} disabled={editAble}> - -
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- {/* */} -
- - - ); - }, - }, - ], tab2: [ - { - title: '项目名称', - dataIndex: 'placeName', - fixed: 'left', - width: 120, - options: 1, - backgroundColor: "#ffffff", - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, - placeholder: '请输入项目名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - render: (dom, record) => { - return record.entryName - }, - }, - { - title: '工程里程（公里/延米）', - search: false, - dataIndex: 'containers', - - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.projectMileage - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '投资（万元）', - search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', - width: 120, - render: (dom, record) => { - return record.investment - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '建设单位', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - - - - width: 120, - render: (dom, record) => { - return record.buildUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监理单位', - search: false, - dataIndex: 'time4', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.constructionControlUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计单位', - search: false, - dataIndex: 'time5', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.designUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '施工单位', - search: false, - dataIndex: 'time6', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.constructionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监督负责人及监督人员', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.supervisorAndSupervisor - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '项目进展情况', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.projectProgress - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 160, - fixed: 'right', - render: (dom, record) => { - return
{ deldatas(record.id) }} disabled={editAble}> - -
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- {/* */} -
- - - ); - }, - }, - ] - } - //打开弹窗 - const openModal = (type, record) => { - setModalVisible(true); - // setModalType(type); - if (type == 'edit') { - setModalRecord(record); - } else { - setModalRecord(null); - } - } - const yilanModal = (type, record) => { - setModalVisibleyilan(true); - // setModalType(type); - if (type == 'edit') { - setModalRecord(record); - } else { - setModalRecord(null); - } - } - return ( - -
- setActiveKey(key), - items: [ - // { - // key: 'tab1', - // label: { - // setWhichofits('qiaoliang') - // setDifferentiate('bridge') - // }}>桥梁{activeKey === 'tab1'}, - // }, - // { - // key: 'tab2', - // label: { - // setWhichofits('gongcheng') - // setDifferentiate('project') - // }}>工程一览{activeKey === 'tab2'}, - // }, - - ], - }, - }} - scroll={{ x: 800 }} - options={false} - ref={c => { finishedProductTable = c; }} - style={{ width: "100% ", overflow: "auto", height: '760px' }} - rowKey='id' - onReset={(v) => { - setSitename('') - }} - rowSelection={{ - selectedRowKeys: rowSelected, - onChange: (selectedRowKeys) => { - setRowSelected(selectedRowKeys); - }, - }} - columns={columns[activeKey]} - - dataSource={counts || []} - request={async (params) => { - if (whichofits == 'qiaoliang') { - const query = { - bridgeName: sitename - } - setRowSelected([]); - const res = await dispatch(getBridge(query)); - // console.log(res) - - setCounts(res.payload.data) - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 - } - } if (whichofits == 'gongcheng') { - const query = { - type: 'bridge', - entryName: sitename - } - setRowSelected([]); - const res = await dispatch(getProject(query)); - setCounts(res.payload.data) - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 - } - } - }} - search={{ - defaultCollapsed: false, - optionRender: (searchConfig, formProps, dom) => [ - {`共有小桥${smallBridge.length}座，中桥${middleBridge.length}座，大桥${bigBridge.length}座`}, - ...dom.reverse(), - { props.exports(rowSelected, differentiate) }} disabled={editAble}> - - - ], - }} - - > - -
- { - modalVisible ? : '' - } - { - modalVisibleyilan ? : '' - } - - ) -} -const date = { - "bridgeCode": "桥梁代码", - "bridgeName": "桥梁名称", - "centralStation": "中心桩号", - "crossingFigureType": "跨越地物类型", - "crossingFigureName": "跨越地物名称", - "natureOfCharges": "收费性质", - "rampCode": "匝道编码", - "sectionType": "路段类型", - "crossingFigureType1": "跨越地物类型1", - "crossingFigureName1": "跨越地物名称1", - "originalBridgeCode": "原桥梁代码", - "whetherWideRoadAndNarrowBridge": "是否宽路窄桥", - "isItInTheDirectoryOfLongAndLongBridges": "是否在长大桥梁目录中", - "whetherItIsACrossProvincialBridge": "是否跨省桥梁", - "interworkingType": "互通类型", - "interworkingForm": "互通形式", - "interworkingAndCrossoverMode": "互通交叉方式", - "bridgeClassification": "桥梁分类", - "totalLengthOfBridge": "桥梁全长", - "totalSpanLength": "跨径总长", - "mainSpanOfMainBridge": "主桥主跨", - "numberOfMainBridgeHoles": "主桥孔数", - "spanCombination": "跨径组合", - "bridgeProperties": "桥梁性质", - "designLoadClass": "设计荷载等级", - "superstructure": "上部结构", - "superstructureMaterials": "上部结构材料", - "bridgeDeckPavementType": "桥面铺装类型", - "bridgeDeckWidth": "桥面宽", - "clearWidthOfBridgeDeck": "桥面净宽", - "clearanceUnderBridge": "桥下净空", - "seismicGrade": "抗震等级", - "navigationClass": "通航等级", - "abutmentType": "桥台类型", - "pierType": "桥墩类型", - "typesOfPierAndAbutmentAntiCollisionFacilities": "墩台防撞设施类型", - "expansionJointType": "伸缩缝类型", - "supportType": "支座类型", - "characteristicsOfCurvedSlope": "弯坡斜特征", - "bridgeHeight": "桥梁高度", - "sidewalkWidth": "人行道宽度", - "constructionUnit": "建设单位", - "completionTime": "建成时间", - "openingDate": "通车日期", - "reconstructionTime": "改建时间", - "totalCost": "总造价", - "nameOfDesignUnit": "设计单位名称", - "nameOfConstructionUnit": "施工单位名称", - "nameOfSupervisionUnit": "监理单位名称", - "natureOfConstruction": "建设性质", - "evaluationDate": "评定日期", - "technicalConditionEvaluation": "技术状况评定", - "assessmentUnit": "评定单位", - "locationOfMajorDiseases": "主要病害位置", - "diseaseDescription": "病害描述", - "takeControlMeasures": "采取管制措施", - "dateOfLastPeriodicInspection": "最近定期检查日期", - "natureOfManagementAndMaintenanceUnit": "管养单位性质", - "managementAndMaintenanceUnit": "管养单位", - "supervisionUnit": "监管单位", - "reconstructionConstructionUnit": "改造施工单位", - "whetherItIsASubsidyProjectOfTheMinistry": "是否部补助项目", - "engineeringProperties": "工程性质", - "reconstructionPart": "改造部位", - "modificationCompletionDate": "改造完工日期", - "year1": "年份1", - "spanCombination1": "跨径组合1", - "investment1": "投资1", - "year2": "年份2", - "spanCombination2": "跨径组合2", - "investment2": "投资2", - "year3": "年份3", - "spanCombination3": "跨径组合3", - "investment3": "投资3", - "year4": "年份4", - "spanCombination4": "跨径组合4", - "investment4": "投资4", - "year5": "年份5", - "spanCombination5": "跨径组合5", - "investment5": "投资5", - "plannedFundCategory": "计划资金类别", - "plannedYear": "计划年度", - "planDocumentNo": "计划文号", - "planItemUniqueCode": "计划项目唯一编码", - "plannedProjectType": "计划项目类型", - "planProjectName": "计划项目名称", - "completionStatus": "完工情况", - "yearOfCompletion": "完工年度", - "reasonForChange": "变更原因", - "changeTime": "变更时间", - "reportingUnit": "填报单位", - "remarks": "备注", - "whetherOverpassBridge": "是否跨线桥", - "offLineBridgeOrNot": "是否线外桥", - "whetherDangerousBridgeReconstruction": "是否危桥改造", - "districtcounty": "所在区县", - "locationCity": "所在地市" -} -const dates = { - "entryName": "项目名称", - "projectMileage": "工程里程", - "investment": "投资", - "buildUnit": "建设单位", - "constructionControlUnit": "监理单位", - "designUnit": "设计单位", - "constructionUnit": "施工单位", - "supervisorAndSupervisor": "监督负责人及监督人员", - "projectProgress": "项目进展情况" -} -function mapStateToProps(state) { - const { auth, depMessage } = state; - const pakData = (dep) => { - return dep.map((d) => { - return { - title: d.name, - value: d.id, - // children: d.type >= 2 ? [] : pakData(d.subordinate) - children: pakData(d.subordinate) - } - }) - } - let depData = pakData(depMessage.data || []) - return { - user: auth.user, - depMessage: depMessage.data || [], - depLoading: depMessage.isRequesting, - depData, - }; -} -export default connect(mapStateToProps)(BrideTable); \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/components/buildingTable.js b/web-network/client/src/sections/fillion/components/buildingTable.js deleted file mode 100644 index da8bf6d..0000000 --- a/web-network/client/src/sections/fillion/components/buildingTable.js +++ /dev/null @@ -1,379 +0,0 @@ -'use strict'; - -import React, { useState, useEffect, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Button, Popconfirm } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import './protable.less' -import ProjectModal from './project/project'; -import { getProject, delProject } from "../actions/infor" - -import moment from 'moment'; -// import UserModal from './infor/details'; -const BuildingTable = (props) => { - const { dispatch, user, depData, depMessage, depLoading } = props - const [rowSelected, setRowSelected] = useState([]) - const [sitename, setSitename] = useState()//名称 - const [counts, setCounts] = useState()//shuju - const [modalVisible, setModalVisible] = useState(false); - const [modalVisibleyilan, setModalVisibleyilan] = useState(false); - const [modalRecord, setModalRecord] = useState(); - const [typecard, setTypecard] = useState(); - const [recortd, setRecortd] = useState() - const [whichofits, setWhichofits] = useState('在建项目') - const [delet, setDelet] = useState() - const [differentiate, setDifferentiate] = useState('road') - const [grade, setGrade] = useState('project') - const [departmentInfo, setDepartment] = useState('') - const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'BUILDINGPROJECT')?.isshow === "true" ? true : '') - //console.log('user111', user) - const ref = useRef() - const [activeKey, setActiveKey] = useState('tab1'); - //打开弹窗 - const yilanModal = (type, record) => { - setModalVisibleyilan(true); - // setModalType(type); - if (type == 'edit') { - setModalRecord(record); - } else { - setModalRecord(null); - } - } - const getData = async () => { - const res = await dispatch(getProject({ - entryName: sitename - })); - setCounts(res.payload.data) - } - const deldatas = async (id) => { // 工程 - const query = { - projectId: id - } - dispatch(delProject(query)).then((res) => { - setDelet(res) - }) - const res = await dispatch(getProject({ - entryName: sitename - })); - setCounts(res.payload.data) - } - - const columns = { - tab1: [ - { - title: '项目名称', - dataIndex: 'placeName', - fixed: 'left', - width: 120, - options: 1, - backgroundColor: "#ffffff", - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, - placeholder: '请输入项目名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - render: (dom, record) => { - return record.entryName - }, - }, - { - title: '项目规模(公里)', - search: false, - dataIndex: 'containers', - - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.projectMileage - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '项目投资（万元）', - search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', - width: 120, - render: (dom, record) => { - return record.investment - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '业主单位', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.buildUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '质量监督单位', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.qutityUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '施工单位', - search: false, - dataIndex: 'time6', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.constructionUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计单位', - search: false, - dataIndex: 'time5', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.designUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监理单位', - search: false, - dataIndex: 'time4', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.constructionControlUnit - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '开工时间', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.startTime ? moment(record.startTime).format('YYYY-MM-DD') : '' - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '是否完成', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.done === true ? '已完成' : '未完成' - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - width: 120, - render: (dom, record) => { - return record.remark - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 160, - fixed: 'right', - render: (dom, record) => { - return
{ deldatas(record.id) }} disabled={editAble}> - -
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- {/* */} -
- - - ); - }, - }, - ] - } - - - - - - - return ( - -
- setActiveKey(key), - items: [ - // { - // key: 'tab1', - // label: { - // setWhichofits('在建项目') - // setDifferentiate('project') - // setGrade('在建项目') - - // }}>在建项目{activeKey === 'tab1'}, - // }, - ], - }, - }} - scroll={{ x: 800 }} - options={false} - ref={c => { finishedProductTable = c; }} - style={{ width: "100% ", overflow: "auto", height: '760px' }} - rowKey='id' - onReset={(v) => { - setSitename('') - }} - rowSelection={{ - selectedRowKeys: rowSelected, - onChange: (selectedRowKeys) => { - setRowSelected(selectedRowKeys); - }, - }} - columns={columns[activeKey]} - dataSource={counts || []} - request={async (params) => { - //console.log(whichofits) - if (whichofits == '在建项目') { - const query = { - entryName: sitename - } - setRowSelected([]); - const res = await dispatch(getProject(query)); - setCounts(res.payload.data) - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 - } - } - }} - search={{ - defaultCollapsed: false, - optionRender: (searchConfig, formProps, dom) => [ - ...dom.reverse(), - { props.exports(rowSelected, grade, differentiate) }} - disabled={user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'BUILDINGPROJECT')?.isshow === "true" ? true : ''} - > - - - ], - }} - > - -
- - {modalVisibleyilan ? : ''} - - ) -} -function mapStateToProps(state) { - const { auth, depMessage } = state; - const pakData = (dep) => { - return dep.map((d) => { - return { - title: d.name, - value: d.id, - // children: d.type >= 2 ? [] : pakData(d.subordinate) - children: pakData(d.subordinate) - } - }) - } - let depData = pakData(depMessage.data || []) - return { - user: auth.user, - depMessage: depMessage.data || [], - depLoading: depMessage.isRequesting, - depData, - }; -} -export default connect(mapStateToProps)(BuildingTable); \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/components/datajuji.js b/web-network/client/src/sections/fillion/components/datajuji.js deleted file mode 100644 index 1ba6cc6..0000000 --- a/web-network/client/src/sections/fillion/components/datajuji.js +++ /dev/null @@ -1,180 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { Modal, Form, Input, Select, DatePicker, AutoComplete, Col, Button, Row } from 'antd'; - -import { MinusCircleOutlined, PlusOutlined, PlusCircleOutlined } from '@ant-design/icons'; -const Search = Input.Search -const { TextArea } = Input; -import moment from 'moment'; - -const EditGuanlang = (props) => { - const { visible, onCancel, editData, handleSaveScore, readOnly, companys, searchCompany, applyState } = props; - const [form] = Form.useForm(); - const [replyFiles, setReplyFiles] = useState([]); - const [companyOpts, setCompanyOpts] = useState([]); - const [stationItem, setStationItem] = useState(null); - const [deviceList, setDeviceList] = useState([]); - - useEffect(() => { - if (!visible) { - form.resetFields() - } - }, [visible]) - - useEffect(() => { - if (editData) { - let revertData = Object.assign({}, editData); - Object.keys(editData).forEach(key => { - if (key == 'accidentTime') { - revertData[key] = editData[key] && moment(editData[key]); - } - if (key == 'images') { - // const list = (editData[key] || '').split(',') || [] - if (editData[key]) { - - revertData[key] = JSON.parse(editData[key]); - } - } - }); - form.setFieldsValue({ ...revertData }); - } - }, [editData]) - - useEffect(() => { - if (companys && companys.length) { - let list = []; - companys.forEach(item => { - list.push({ label: item.company, value: item.company }) - }) - setCompanyOpts(list); - } - }, [companys]) - - useEffect(() => { - if (editData && companys && companys.length) { - handleSelectCompany(null, { value: editData.companyName }) - let list = ((editData || {}).accidentStations || []).map(item => item.stationId) - form.setFieldsValue({ stations: list }) - } - }, [companys, editData]) - - - const handleSave = () => { - const data = form.getFieldsValue(true); - //console.log(data, 'data') - handleSaveScore(); - } - - const onFileUploaded = (fileList) => { - setReplyFiles(fileList); - } - - const handleSelectCompany = (v, opt) => { - const { value } = opt; - const target = companys.filter(c => c.company == value); - setDeviceList(target[0]?.deviceInfos || []); - - } - const data1 = [ - { label: '2021年12月', value: '2021年12月' }, - { label: '2021年11月', value: '2021年11月' }, - { label: '2021年10月', value: '2021年10月' }, - { label: '2021年9月', value: '2021年9月' }, - { label: '2021年8月', value: '2021年8月' }, - { label: '2021年7月', value: '2021年7月' }, - { label: '2021年6月', value: '2021年6月' }, - { label: '2021年5月', value: '2021年5月' }, - { label: '2021年4月', value: '2021年4月' }, - { label: '2021年3月', value: '2021年3月' }, - { label: '2021年2月', value: '2021年2月' }, - { label: '2021年1月', value: '2021年1月' }] - - const data2 = [ - { label: '噪声传感器', value: '噪声传感器' }, - { label: '导轮式固定测斜仪', value: '导轮式固定测斜仪' }, - { label: '闭合式磁通量传感器', value: '闭合式磁通量传感器' }, - { label: '扬尘监测系统', value: '扬尘监测系统' }, - { label: '空气质量监测系统', value: '空气质量监测系统' }, - { label: '车辆动态称重系统', value: '车辆动态称重系统' }, - { label: '多通道振动采集仪', value: '多通道振动采集仪' }, - { label: '应急照明控制器', value: '应急照明控制器' }, - { label: '钢筋计', value: '钢筋计' }, - { label: '噪声传感器', value: '噪声传感器' }, - { label: '风速风向仪', value: '风速风向仪' }, - { label: '静力水准仪', value: '静力水准仪' }, - { label: '表面式应变计', value: '表面式应变计' }, - { label: '光纤光栅锚索计', value: '光纤光栅锚索计' }, - { label: '加速度计', value: '加速度计' }, - { label: '闭合式磁通量传感器', value: '闭合式磁通量传感器' }, - { label: '开环式磁通量传感器', value: '开环式磁通量传感器' }, - { label: '压差式变形测量传感器', value: '压差式变形测量传感器' }, - { label: '多通道振动采集仪', value: '多通道振动采集仪' }, - { label: '压电式传感器', value: '压电式传感器' }, - { label: '钢筋计', value: '钢筋计' }, - { label: '盒式固定测斜仪', value: '盒式固定测斜仪' }, - { label: '拉线位移传感器', value: '拉线位移传感器' }, - { label: '表面式应变计', value: '表面式应变计' }, - { label: '芯型土压力计', value: '芯型土压力计' }, - { label: '芯型锚索计', value: '芯型锚索计' }, - { label: '收敛仪', value: '收敛仪' }, - { label: '激光测距仪 ', value: '激光测距仪 ' }, - { label: '磁电式传感器', value: '磁电式传感器' }, - { label: '压电式传感器', value: '压电式传感器' }, - { label: '锚索计', value: '锚索计' }, - { label: '静力水准仪 ', value: '静力水准仪 ' }, - { label: '移动测斜仪 ', value: '移动测斜仪 ' } - ] - return ( - -
- - - - - - - - - - - - - - - - - - - - - - - - -
- *汇集历史数据，接入物联网监测数据，实现大数据的接入解算。 - - ) -} - - -export default EditGuanlang; diff --git a/web-network/client/src/sections/fillion/components/editGuanlang.js b/web-network/client/src/sections/fillion/components/editGuanlang.js deleted file mode 100644 index cc82097..0000000 --- a/web-network/client/src/sections/fillion/components/editGuanlang.js +++ /dev/null @@ -1,211 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { Modal, Form, Input, Select, DatePicker, AutoComplete, Col, Button, Row } from 'antd'; - -import { MinusCircleOutlined, PlusOutlined, PlusCircleOutlined } from '@ant-design/icons'; -const Search = Input.Search -const { TextArea } = Input; -import moment from 'moment'; - -const EditGuanlang = (props) => { - const { visible, onCancel, editData, handleSaveScore, readOnly, companys, searchCompany, applyState } = props; - const [form] = Form.useForm(); - const [replyFiles, setReplyFiles] = useState([]); - const [companyOpts, setCompanyOpts] = useState([]); - const [stationItem, setStationItem] = useState(null); - const [deviceList, setDeviceList] = useState([]); - - useEffect(() => { - if (!visible) { - form.resetFields() - } - }, [visible]) - - useEffect(() => { - if (editData) { - let revertData = Object.assign({}, editData); - Object.keys(editData).forEach(key => { - if (key == 'accidentTime') { - revertData[key] = editData[key] && moment(editData[key]); - } - if (key == 'images') { - // const list = (editData[key] || '').split(',') || [] - if (editData[key]) { - - revertData[key] = JSON.parse(editData[key]); - } - } - }); - form.setFieldsValue({ ...revertData }); - } - }, [editData]) - - useEffect(() => { - if (companys && companys.length) { - let list = []; - companys.forEach(item => { - list.push({ label: item.company, value: item.company }) - }) - setCompanyOpts(list); - } - }, [companys]) - - useEffect(() => { - if (editData && companys && companys.length) { - handleSelectCompany(null, { value: editData.companyName }) - let list = ((editData || {}).accidentStations || []).map(item => item.stationId) - form.setFieldsValue({ stations: list }) - } - }, [companys, editData]) - - - const handleSave = () => { - const data = form.getFieldsValue(true); - //console.log(data,'data') - handleSaveScore(); - } - - const onFileUploaded = (fileList) => { - setReplyFiles(fileList); - } - - const handleSelectCompany = (v, opt) => { - const { value } = opt; - const target = companys.filter(c => c.company == value); - setDeviceList(target[0]?.deviceInfos || []); - - } - - return ( - -
- - - 配置属性 - - {/* */} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - ) -} - - -export default EditGuanlang; diff --git a/web-network/client/src/sections/fillion/components/enforceTable.js b/web-network/client/src/sections/fillion/components/enforceTable.js deleted file mode 100644 index 3271ce9..0000000 --- a/web-network/client/src/sections/fillion/components/enforceTable.js +++ /dev/null @@ -1,1639 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Button, Popconfirm, Badge } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import './protable.less' -import moment from 'moment'; -import { getReportStatistic } from "../actions/infor" -import UserModal from './infor/details'; - -const enforceTable = (props) => { - const { dispatch, user, depData, depMessage, depLoading } = props - const [rowSelected, setRowSelected] = useState([]) - // const [regionId, setRegionId] = useState()//区域id - // const [placeType, setPlaceType] = useState()//场所 - // const [day, setDay] = useState([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')])//日期 - const [sitename, setSitename] = useState()//场所名称 - const [counts, setCounts] = useState()//shuju - const [modalVisible, setModalVisible] = useState(false); - const [modalRecord, setModalRecord] = useState(); - const [typecard, setTypecard] = useState(); - - //打开弹窗 - const openModal = (type, record) => { - setModalVisible(true); - // setModalType(type); - if (type == 'edit') { - setModalRecord(record); - } else { - setModalRecord(null); - } - } - //批量导出 - const exports = (ids, counts) => { - // console.log(user); - let reportIds = []; - if (ids.length) - reportIds = ids - else - reportIds = (counts || {}).ids || []; - superagent.post('/_report/http') - .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => { - const resTextIs = res.text.split('/').pop() - window.open( - '/_api/' + - `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`) - }) - } - const columns = - [ - { - title: '桥梁代码', - dataIndex: 'placeName', - fixed: 'left', - width: 120, - options: 1, - backgroundColor: "#ffffff", - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, - placeholder: '请输入道路名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - }, - { - title: '桥梁名称', - search: false, - dataIndex: 'containers', - - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '中心桩号', - search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '跨越地物类型', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物名称', - search: false, - dataIndex: 'time4', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '收费性质', - search: false, - dataIndex: 'time5', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '匝道编码', - search: false, - dataIndex: 'time6', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段类型', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物类型1', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨越地物名称1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原桥梁代码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否宽路窄桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否在长大桥梁目录中', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否跨省桥梁', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通形式', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '互通交叉方式', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁分类', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁全长', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径总长', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主桥主跨', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主桥孔数', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计荷载等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上部结构', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上部结构材料', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面铺装类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面宽', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥面净宽', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥下净空', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '抗震等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '通航等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥台类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥墩类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '墩台防撞设施类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '伸缩缝类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '支座类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '弯坡斜特征', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桥梁高度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '人行道宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建设单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建成时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '通车日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改建时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '总造价', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '施工单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监理单位名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建设性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '评定日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '技术状况评定', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '评定单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '主要病害位置', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '病害描述', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '采取管制措施', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '最近定期检查日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '监管单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造施工单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否部补助项目', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '工程性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造部位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改造完工日期', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资1', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资2', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资3', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '跨径组合4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资4', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '年份5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '跨径组合5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '投资5', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更原因', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '填报单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否跨线桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否线外桥', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否危桥改造', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在区县', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在地市', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 160, - fixed: 'right', - render: (dom, record) => { - return
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => { - return ( -
- -
- - - ); - }, - }, - ] - return ( - -
- { finishedProductTable = c; }} - style={{ width: "100% ", overflow: "auto", height: '760px' }} - rowKey='id' - onReset={(v) => { - const { id } = depMessage[0] - // console.log(id) - // setRegionId(id) - // setPlaceType(-1) - // setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) - setSitename('') - }} - rowSelection={{ - selectedRowKeys: rowSelected, - onChange: (selectedRowKeys) => { - setRowSelected(selectedRowKeys); - }, - }} - columns={columns} - - dataSource={(counts || {}).rows || []} - request={async (params) => { - const query = { - startDate: day[0], - endDate: day[1], - placeType: placeType, - regionId: regionId, - placeName: sitename, - limit: params.pageSize, - offset: ((params.current ? params.current : 1) - 1) * params.pageSize - } - setRowSelected([]); - const res = await dispatch(getReportStatistic(query)); - setCounts(res.payload.data) - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 - } - }} - search={{ - defaultCollapsed: false, - optionRender: (searchConfig, formProps, dom) => [ - ...dom.reverse(), - { props.exports(rowSelected, counts) }}> - - - ], - }} - - > -
- - - ) -} -function mapStateToProps(state) { - const { auth, depMessage } = state; - const pakData = (dep) => { - return dep.map((d) => { - return { - title: d.name, - value: d.id, - // children: d.type >= 2 ? [] : pakData(d.subordinate) - children: pakData(d.subordinate) - } - }) - } - let depData = pakData(depMessage.data || []) - return { - user: auth.user, - depMessage: depMessage.data || [], - depLoading: depMessage.isRequesting, - depData, - }; -} -export default connect(mapStateToProps)(enforceTable); \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/components/feedback/nominateModal.js b/web-network/client/src/sections/fillion/components/feedback/nominateModal.js deleted file mode 100644 index 3291cbb..0000000 --- a/web-network/client/src/sections/fillion/components/feedback/nominateModal.js +++ /dev/null @@ -1,169 +0,0 @@ -'use strict'; -import React, { useState, useEffect, useCallback, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Spin } from 'antd'; -import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect, ProFormSelect, Form } from '@ant-design/pro-form'; -import { getDepUser } from '../../../organization/actions/user' -import { appointTask } from '../../actions/appointTask' -import { getReportList, } from '../../../fillion/actions/patrol'; -import moment from 'moment'; -import { v4 as uuidv4 } from 'uuid'; - - -const NominateModal = (props) => { - const { queryData, recordId, visible, user, onCancel, depMessage, loading, depUser, clientHeight, depData, onVisibleChange, dispatch } = props - const [depId, setDepId] = useState(null) - const [depUsers, setDepUsers] = useState() - - - const handleTreeSelectChange = async (value) => { - //console.log('recordId', recordId) - setDepId(value) - // 根据选择的部门ID获取对应的用户数据 - setDepUsers([]) - const res = await dispatch(getDepUser(value)); - setDepUsers(res?.payload.data); - //setSelectKey(selectKey + 1) - // 清空第二个输入框的值 - - } - - // useEffect(() => { - // setSelectKey(selectKey + 1) - // }, [depUsers]) - const handleFinish = async (values) => { - const { name } = values; - // 在这里使用第二个框的值进行网络请求或其他操作 - await dispatch(appointTask({ recordId, performerId: name })) - //form.resetFields(); // 重置表单字段 - //formRef.current.resetFields(); - queryData() - onCancel() - - }; - const dispatchGetDepUser = useCallback(async () => { - if (depId) { - const res = await dispatch(getDepUser(depId)); - setDepUsers(res?.payload.data); - } - }, [depId, dispatch]); - - useEffect(() => { - dispatchGetDepUser() - }, [dispatchGetDepUser]) - const [depMessagedata, setdepMessagedata] = useState(depMessage) - return ( - - - - { - //console.log('selected', selectedKeys) - - if (selected) { - setDepSelectedKeys(selectedKeys) - setDepSelected(selectedNodes[0].name || "") - dispatch(getDepUser(selectedKeys[0])) - } - }} - fieldProps={{ - onChange: handleTreeSelectChange, - fieldNames: { - label: 'title', - - }, - treeDefaultExpandAll: false, - }} - rules={[{ required: true, message: '请选择所属部门' }]} - request={async () => { - return depData - }} - expandedKeys={["title"]} - /> - {depUsers && depUsers.length && depUsers.some(item => item.isAdmin === true) ? { console.log('values1', values) }} - name={'name'} - label="指派人" - request={async () => { - if (depId) { - const res = await dispatch(getDepUser(depId)); - const copy = res?.payload.data.filter((user) => { - if (user.isAdmin) { - return user - } - } - ) - let processedUsers = copy.map((item) => { - return { - label: item.name, - value: item.id, - } - }) - - return Promise.resolve(processedUsers) - - } - - }} - placeholder="请选择指派人" - rules={[{ required: true, message: '请选择指派人' }]} - /> : ''} - - - - - - - ) -} - -function mapStateToProps(state) { - const { auth, depMessage, depUser, global } = state - const pakData = (dep) => { - // console.log(dep); - return dep.map((d) => { - return { - title: d.name, - value: d.id, - // key: d.id, - children: pakData(d.subordinate) - } - }) - } - let depData = pakData(depMessage.data || []) - // return { - // loading: depMessage.isRequesting, - // depData, - // }; - return { - user: auth.user, - clientHeight: global.clientHeight, - loading: depMessage.isRequesting, - //depMessage: depMessage.data || [], - depUser: depUser.data || [], - depData - } -} -export default connect(mapStateToProps)(NominateModal); \ No newline at end of file diff --git a/web-network/client/src/sections/fillion/components/feedback/nominateModalcopy.js b/web-network/client/src/sections/fillion/components/feedback/nominateModalcopy.js deleted file mode 100644 index 7d3381a..0000000 --- a/web-network/client/src/sections/fillion/components/feedback/nominateModalcopy.js +++ /dev/null @@ -1,136 +0,0 @@ -'use strict'; -import React, { useState, useEffect, useCallback, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Spin, TreeSelect, Modal, Form, Select, Input } from 'antd'; -import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect, ProFormSelect } from '@ant-design/pro-form'; -import { getDepUser } from '../../../organization/actions/user' -import { appointTask, pushAppointSMS } from '../../actions/appointTask' -import moment from 'moment' -import { v4 as uuidv4 } from 'uuid'; - -const { TextArea } = Input; - -const NominateModal = (props) => { - const { queryData, recordId, visible, user, onCancel, depMessage, loading, depUser, clientHeight, depData, onVisibleChange, dispatch } = props - const [depId, setDepId] = useState(0) - const [depUsers, setDepUsers] = useState([]) - // const [value, setValue] = useState(undefined); - const [selectedUserId, setSelectedUserId] = useState(null); - const [form] = Form.useForm(); - - const handleTreeSelectChange = async (value) => { - setSelectedUserId(null) - setDepId(value) - // 根据选择的部门ID获取对应的用户数据 - //setDepUsers([]) - const res = await dispatch(getDepUser(value)) - let processedUsers = res.payload.data?.map((item) => { - return { - label: item.name, - value: item.id, - phone: item.phone - } - }) - setDepUsers(processedUsers) - form.resetFields(['nameId']) - - } - const handleFinish = () => { - form.validateFields().then(values => { - dispatch(appointTask({ recordId: recordId, performerId: values.nameId, handleAdvice: values.handleOpinions, handleState: '已指派' })).then((res) => { - if (res.success) { - setSelectedUserId(null) - queryData() - onCancel() - setDepUsers([]) - form.resetFields() - // const phone = depUsers.find(u => u.value == values.nameId)?.phone; - // dispatch(pushAppointSMS({ phone: [phone] })) - } - }) - }) - - } - - const cancelHandler = () => { - // form.resetFields() - // setDepUsers([]) - onCancel() - } - return ( - - -
-
-
- - - - -
-
- - - - -
-
- -