（*）储备项目周期统计表debug调整

.vscode/launch.json

@@ -15,31 +15,33 @@
          "args": [
             "-p 4700",
             // "-f http://localhost:4700",
-            // 研发
-            "-g postgres://postgres:123456@10.8.16.184:5432/ReportCenter",
+            //南昌研发开始
+            // "-g postgres://postgres:123456@10.8.16.184:5432/ReportCenter",
+            // "--redisHost localhost",
+            // "--redisPort 6378",
+            // "--apiEmisUrl http://localhost:4000",
+            //南昌研发结束
+            // 镇江研发开始
+            "-g postgres://FashionAdmin:123456@10.8.30.36:5432/data_center",
             "--redisHost localhost",
-            "--redisPort 6378",
-            // "--apiEmisUrl http://10.8.30.112:14000",
+            "--redisPort 6379",
+            "--apiEmisUrl http://localhost:14000",
+            // 镇江研发结束
             // 测试
-            "--apiEmisUrl http://localhost:4000",
             "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5",
             "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa",
             "--qnbkt dev-hr",
             // "--qndmn http://resources.anxinyun.cn",
             "--qndmn http://rjkwed13l.hn-bkt.clouddn.com",
-            
             // 似乎不能传空 先注释 * 2
             // "--clickHouseUser ",
             // "--clickHousePassword ",
-
             "--clickHousePort 30123",
-
             // 开发
             // "--clickHouseUrl http://10.8.30.71",
             // "--clickHousePepEmis pepca_dev",
             // "--clickHouseCamworkflow camworkflow",
             // "--clickHouseHr hr_dev",
-
             // 测试
             "--clickHouseUrl http://10.8.16.221",
             "--clickHousePepEmis pg_pepca",

web/client/src/sections/business/actions/reserve-item.js

@@ -6,7 +6,7 @@ export function getReserveItemReport(type) {
         type: 'get',
         dispatch: dispatch,
         actionType: 'GET_RESERVEITEM_REPORT',
-        url: `${ApiTable.getReserveItemReport.replace('{:type}', type)}`,
+        url: `${ApiTable.getReserveItemReport.replace('{type}', type)}`,
         msg: { error: '获取储备项目统计信息失败' },
         reducer: { name: 'reserveItemReport' }
     });

web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx

@@ -4,12 +4,11 @@ import { Select, Input, Spin, Button, RadioGroup, Radio, Table } from '@douyinfe
 import { IconSearch } from '@douyinfe/semi-icons';
 import { RESERVEITEM_TYPE } from '../constants'
 import '../style.less'
-import moment from 'moment'
 
 const ReserveItemsPeriodicStatistics = (props) => {
-    const { dispatch, actions, isResquesting, reserveItemReport } = props;
+    const { dispatch, actions, isRequesting, reserveItemReport } = props;
     useEffect(() => {
-        dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE["periodicStatistics"]));
+        dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE.periodicStatistics));
     }, [])
     const columns = [
         {
@@ -19,11 +18,11 @@ const ReserveItemsPeriodicStatistics = (props) => {
         },
         {
             title: '时间',
-            dataIndex: 'updateTime',
+            dataIndex: 'year',
         },
         {
             title: '名称',
-            dataIndex: 'name',
+            dataIndex: 'path',
         },
         {
             title: '操作',
@@ -31,24 +30,6 @@ const ReserveItemsPeriodicStatistics = (props) => {
             render: (text, record, indexe) => (<Button theme='solid' type='secondary'>导出</Button>)
         },
     ];
-    // const data = [
-    //     {
-    //         key: '1',
-    //         name: 'Semi Design 设计稿.fig',
-    //         updateTime: '2020-02-02 05:13',
-    //         avatarBg: 'grey',
-    //     },
-    //     {
-    //         key: '2',
-    //         name: 'Semi Design 分享演示文稿',
-    //         updateTime: '2020-01-17 05:31',
-    //     },
-    //     {
-    //         key: '3',
-    //         name: '设计文档',
-    //         updateTime: '2020-01-26 11:01',
-    //     },
-    // ];
 
     return (
         <>
@@ -70,12 +51,13 @@ const ReserveItemsPeriodicStatistics = (props) => {
                     </div>
                     <div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div>
 
-                    <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 22 }}>
-                        <Spin spinning={isResquesting}>
+                    <div style={{ marginBottom: 22 }}>
+                        <Spin spinning={isRequesting}>
                             <Table
+                                rowKey={"id"}
                                 columns={columns}
                                 dataSource={reserveItemReport}
-                                // pagination={false}
+                            // pagination={false}
                             />
                         </Spin>
                     </div>
@@ -92,7 +74,7 @@ function mapStateToProps(state) {
         user: auth.user,
         actions: global.actions,
         reserveItemReport: reserveItemReport.data || [],
-        isResquesting: reserveItemReport.isResquesting
+        isRequesting: reserveItemReport.isRequesting
     };
 }
 

web/client/src/utils/webapi.js

@@ -17,7 +17,7 @@ export const ApiTable = {
    logout: "logout",
 
    //项目报表
-   getReserveItemReport: "/reserveItem/report/:type"
+   getReserveItemReport: "/reserveItem/report/{type}"
 
 };
 export const RouteTable = {